fixed minor plural bug and declaratives relation ordering.

percious · percious · commit bdab05776773 · 2010-10-05T14:12:34.000-06:00
diff --git a/sqlautocode/declarative.py b/sqlautocode/declarative.py
@@ -241,7 +241,7 @@ def __repr__(cls):
                     else:
                         s += "    __tablename__ = '%s'\n\n"%table_name
                         if hasattr(cls, '__table_args__'):
-                            s+="    __table_args__ = %s"%cls.__table_args__
+                            s+="    __table_args__ = %s\n\n"%cls.__table_args__
                         s += "    #column definitions\n"
                         for column in sorted(cls.__table__.c, by_name):
                             s += "    %s = %s\n"%(column.name, column_repr(column))
@@ -281,7 +281,8 @@ def __repr__(cls):
             log.info('    Adding <primary> foreign key for:%s'%related_table.name)
             backref_name = plural(table_name)
 #            import ipdb; ipdb.set_trace()
-            rel = relation(singular(name2label(related_table.name, related_table.schema)), primaryjoin=column==column.foreign_keys[0].column)#, backref=backref_name)
+            rel = relation(singular(name2label(related_table.name, related_table.schema)), 
+                           primaryjoin=column.foreign_keys[0].column==column)#, backref=backref_name)
             setattr(Temporal, related_table.name, _deferred_relationship(Temporal, rel))
         
         """
diff --git a/sqlautocode/util.py b/sqlautocode/util.py
@@ -119,7 +119,7 @@ def glob_intersection(collection, subset):
 ('feet$',     'fee$', 'foot'),
 ('eeth$',     'eeth$', 'ooth'),
 ('l[eo]aves', 'l([eo])af$', 'l\\1af$'),
-('ses$',      'ses$', 'sis'),
+('ses$',      'ses$', 's'),
 ('men$',      'men$', 'man'),
 ('ives$',     'ives$', 'ife'),
 ('eaux$',     'eaux$', 'eau'),
@@ -129,6 +129,7 @@ def glob_intersection(collection, subset):
 ('pies$' ,    'pies$', 'pie'),
 ('ovies$' ,     'ovies$', 'ovie'),
 ('ies$' ,     'ies$', 'y'),
+('xes$' ,     'xes$', 'x'),
 #('(qu|[^aeiou])y$', 'y$', 'ies'),
 ('s$',        's$', '')
 )
