Fixed TypeError when inflect couldn't determine a name for a relationship from the remote table name

agronholm · agronholm · commit d906e0f679a7 · 2013-06-12T22:26:12.000+03:00
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,12 @@
 Version history
 ===============
 
+1.1.1
+-----
+
+* Fixed TypeError when inflect could not determine the singular name of a table for a many-to-1 relationship
+
+
 1.1.0
 -----
 
diff --git a/sqlacodegen/__init__.py b/sqlacodegen/__init__.py
@@ -1 +1 @@
-version = '1.1.0.post1'
+version = '1.1.1.pre1'
diff --git a/sqlacodegen/codegen.py b/sqlacodegen/codegen.py
@@ -355,7 +355,10 @@ def __init__(self, source_cls, target_cls, constraint, inflect_engine):
 
         colname = constraint.columns[0]
         tablename = constraint.elements[0].column.table.name
-        self.preferred_name = inflect_engine.singular_noun(tablename) if not colname.endswith('_id') else colname[:-3]
+        if not colname.endswith('_id'):
+            self.preferred_name = inflect_engine.singular_noun(tablename) or tablename
+        else:
+            self.preferred_name = colname[:-3]
 
         # Add uselist=False to One-to-One relationships
         if any(isinstance(c, (PrimaryKeyConstraint, UniqueConstraint)) and
diff --git a/test/test_codegen.py b/test/test_codegen.py
@@ -509,6 +509,44 @@ class SimpleItem(Base):
     other_item = relationship('OtherItem', uselist=False)
 """)
 
+    def test_onetomany_noinflect(self):
+        Table(
+            'oglkrogk', self.metadata,
+            Column('id', INTEGER, primary_key=True),
+            Column('fehwiuhfiwID', INTEGER),
+            ForeignKeyConstraint(['fehwiuhfiwID'], ['fehwiuhfiw.id']),
+        )
+        Table(
+            'fehwiuhfiw', self.metadata,
+            Column('id', INTEGER, primary_key=True)
+        )
+
+        eq_(self.generate_code(), """\
+# coding: utf-8
+from sqlalchemy import Column, ForeignKey, Integer
+from sqlalchemy.orm import relationship
+from sqlalchemy.ext.declarative import declarative_base
+
+
+Base = declarative_base()
+metadata = Base.metadata
+
+
+class Fehwiuhfiw(Base):
+    __tablename__ = 'fehwiuhfiw'
+
+    id = Column(Integer, primary_key=True)
+
+
+class Oglkrogk(Base):
+    __tablename__ = 'oglkrogk'
+
+    id = Column(Integer, primary_key=True)
+    fehwiuhfiwID = Column(ForeignKey('fehwiuhfiw.id'))
+
+    fehwiuhfiw = relationship('Fehwiuhfiw')
+""")
+
     def test_manytomany(self):
         Table(
             'simple_items', self.metadata,

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = '1.1.0.post1'`
	`1`	`+version = '1.1.1.pre1'`