now we handle multiple schemas.

percious · percious · commit 073aaea8b19c · 2009-09-02T15:27:24.000-06:00
diff --git a/sqlautocode/config.py b/sqlautocode/config.py
@@ -34,7 +34,7 @@ def create_parser():
     parser.add_option(
         "-s", "--schema",
         help="Optional, reflect a non-default schema",
-        action="store", dest="schema")
+        action="callback", callback=_prep_schema, type="string", dest="schema")
 
     parser.add_option(
         "-t", "--tables",
@@ -104,6 +104,16 @@ def _prep_tables(option, opt_str, value, parser):
                                 for x in value.split(',')
                                 if x.strip() != '']
 
+def _prep_schema(option, opt_str, value, parser):
+    #handle multiple schemas on the command line
+    value = [x.strip()
+                for x in value.split(',')
+                if x.strip() != '']
+    if len(value) == 1:
+        parser.values.schema = value[0]
+        return
+    parser.values.schema = value
+
 def _version_check(parser):
     try:
         import sqlalchemy
diff --git a/sqlautocode/declarative.py b/sqlautocode/declarative.py
@@ -86,13 +86,14 @@ def __init__(self, config):
             if isinstance(schema, (list, tuple)):
                 self.schemas = schema
             else:
-                self.schems = (schema, )
+                self.schemas = (schema, )
             for schema in self.schemas:
                 logging.info('Reflecting database... schema:%s'%schema)
                 self._metadata.reflect(schema=schema)
         else:
             logging.info('Reflecting database...')
-            self._metadata.reflect
+            self._metadata.reflect()
+    
         
         self.DeclarativeBase = declarative_base(metadata=self._metadata)
 
@@ -127,7 +128,7 @@ def __repr__(self):
 
     @property
     def tables(self):
-        return sorted(self._metadata.tables.keys())
+        return self._metadata.tables.keys()
     
     @property
     def models(self):
diff --git a/sqlautocode/main.py b/sqlautocode/main.py
@@ -6,6 +6,24 @@
 def main():
     config.configure()
 
+    options = config.options
+    if options.declarative:
+        config.interactive = None
+        if options.interactive:
+            config.interactive = True
+        config.schema = None
+        if options.schema:
+            config.schema = options.schema
+        config.example=False
+        if options.example:
+            config.example=True
+        factory = ModelFactory(config)
+        emit(repr(factory))
+        config.out.close()
+        config.out = sys.stdout
+        print >>config.err, "Output written to %s" % options.output
+        return
+
     import formatter
     formatter.monkey_patch_sa()
     
@@ -46,22 +64,6 @@ def main():
     else:
         dialect = 'from sqlalchemy.databases.%s import *\n' % db.name
 
-    if options.declarative:
-        config.interactive = None
-        if options.interactive:
-            config.interactive = True
-        config.schema = None
-        if options.schema:
-            config.schema = options.schema
-        config.example=False
-        if options.example:
-            config.example=True
-        factory = ModelFactory(config)
-        emit(repr(factory))
-        config.out.close()
-        config.out = sys.stdout
-        print >>config.err, "Output written to %s" % options.output
-        return
     
     header = options.z3c and constants.HEADER_Z3C or constants.HEADER
     emit(header % {'dialect': dialect, 'encoding': options.encoding})
diff --git a/sqlautocode/tests/data/devdata.db b/sqlautocode/tests/data/devdata.db
diff --git a/sqlautocode/tests/test_declarative.py b/sqlautocode/tests/test_declarative.py
@@ -2,16 +2,16 @@
 from nose.tools import eq_
 from sqlautocode.declarative import ModelFactory
 from sqlalchemy.orm import class_mapper
-#testdb = 'sqlite:///'+os.path.abspath(os.path.dirname(__file__))+'/data/devdata.db'
-testdb = 'postgres://postgres@localhost/TestSamples'
+testdb = 'sqlite:///'+os.path.abspath(os.path.dirname(__file__))+'/data/devdata.db'
+#testdb = 'postgres://postgres@localhost/TestSamples'
 
 print testdb
 class DummyConfig:
     engine  = testdb
     example = True
     schema = None
     interactive = None
-    schema = ['pdil_samples', 'pdil_tools']
+#    schema = ['pdil_samples', 'pdil_tools']
 
  
 class TestModelFactory:
@@ -53,7 +53,7 @@ def test_get_foreign_keys(self):
         eq_(columns, ['town_id'])
         
         
-    def test_model__repr__(self):
+    def test_model___repr__(self):
         models = sorted(self._setup_all_models())
         for model in models:
             if model.__name__=='TgUser':
