reorganizing classnames a bit, flagging "private" classes in the sql package,

getting the generated docs to look a little nicer.
fixes to extensions, sqlsoup etc. to be compatible with recent API tweaks

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 1af957f74..e348b19ee 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -383,8 +383,8 @@ class Transaction(object):
         if self.__parent is self:
             self.__connection._commit_impl()
             self.__is_active = False
-        
-class ComposedSQLEngine(sql.Engine, Connectable):
+
+class Engine(sql.Executor, Connectable):
     """
     Connects a ConnectionProvider, a Dialect and a CompilerFactory together to 
     provide a default implementation of SchemaEngine.
@@ -415,7 +415,7 @@ class ComposedSQLEngine(sql.Engine, Connectable):
             connection.close()
     
     def _func(self):
-        return sql.FunctionGenerator(self)
+        return sql._FunctionGenerator(self)
     func = property(_func)
     def text(self, text, *args, **kwargs):
         """returns a sql.text() object for performing literal queries."""