moving sqlite filename into named options

4 files changed, 32 insertions, 5 deletions

diff --git a/lib/sqlalchemy/databases/__init__.py b/lib/sqlalchemy/databases/__init__.py
index 34984e088..7f47fc4d2 100644
--- a/lib/sqlalchemy/databases/__init__.py
+++ b/lib/sqlalchemy/databases/__init__.py
@@ -16,3 +16,4 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
+__ALL__ = ['oracle', 'postgres', 'sqlite']
\ No newline at end of file
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 696c59dda..aa25ffec6 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -67,6 +67,15 @@ colspecs = {
 
 def engine(*args, **params):
     return OracleSQLEngine(*args, **params)
+
+def descriptor():
+    return {'name':'oracle',
+    'description':'Oracle',
+    'arguments':[
+        ('dsn', 'Data Source Name', None),
+        ('user', 'Username', None),
+        ('password', 'Password', None)
+    ]}
     
 class OracleSQLEngine(ansisql.ANSISQLEngine):
     def __init__(self, opts, use_ansi = True, module = None, **params):
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index a3a84c742..d38db22e4 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -114,6 +114,16 @@ gen_key_constraints = schema.Table("key_column_usage", generic_engine,
 def engine(opts, **params):
     return PGSQLEngine(opts, **params)
 
+def descriptor():
+    return {'name':'postgres',
+    'description':'PostGres',
+    'arguments':[
+        ('user',"Database Username",None),
+        ('password',"Database Password",None),
+        ('database',"Database Name",None),
+        ('host',"Hostname", None),
+    ]}
+
 class PGSQLEngine(ansisql.ANSISQLEngine):
     def __init__(self, opts, module = None, **params):
         if module is None:
diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py
index 453618fde..da993d9a5 100644
--- a/lib/sqlalchemy/databases/sqlite.py
+++ b/lib/sqlalchemy/databases/sqlite.py
@@ -73,12 +73,19 @@ pragma_names = {
     'BLOB' : SLBinary,
 }
 
-def engine(filename, opts, **params):
-    return SQLiteSQLEngine(filename, opts, **params)
-
+def engine(opts, **params):
+    return SQLiteSQLEngine(opts, **params)
+
+def descriptor():
+    return {'name':'sqlite',
+    'description':'SQLite',
+    'arguments':[
+        ('filename', "Database Filename",None)
+    ]}
+    
 class SQLiteSQLEngine(ansisql.ANSISQLEngine):
-    def __init__(self, filename, opts, **params):
-        self.filename = filename
+    def __init__(self, opts, **params):
+        self.filename = opts.pop('filename')
         self.opts = opts or {}
         ansisql.ANSISQLEngine.__init__(self, **params)