Handle invalid characters in table names (agronholm#61)

danohu · agronholm · commit 26295567989c · 2018-05-19T18:06:03.000+03:00
Fixes agronholm#60.
diff --git a/sqlacodegen/codegen.py b/sqlacodegen/codegen.py
@@ -22,7 +22,6 @@
     import geoalchemy2  # noqa: F401
 except ImportError:
     pass
-
 _re_boolean_check_constraint = re.compile(r"(?:(?:.*?)\.)?(.*?) IN \(0, 1\)")
 _re_column_name = re.compile(r'(?:(["`]?)(?:.*)\1\.)?(["`]?)(.*)\2')
 _re_enum_check_constraint = re.compile(r"(?:(?:.*?)\.)?(.*?) IN \((.+)\)")
@@ -196,8 +195,9 @@ def __init__(self, table, association_tables, inflect_engine, detect_joined):
             relationship_ = ManyToManyRelationship(self.name, target_cls, association_table)
             self._add_attribute(relationship_.preferred_name, relationship_)
 
-    @staticmethod
-    def _tablename_to_classname(tablename, inflect_engine):
+    @classmethod
+    def _tablename_to_classname(cls, tablename, inflect_engine):
+        tablename = cls._convert_to_valid_identifier(tablename)
         camel_case_name = ''.join(part[:1].upper() + part[1:] for part in tablename.split('_'))
         return inflect_engine.singular_noun(camel_case_name) or camel_case_name
 
diff --git a/tests/test_codegen.py b/tests/test_codegen.py
@@ -1013,7 +1013,7 @@ class SimpleItem(Base):
 
     def test_invalid_attribute_names(self):
         Table(
-            'simple_items', self.metadata,
+            'simple-items', self.metadata,
             Column('id-test', INTEGER, primary_key=True),
             Column('4test', INTEGER),
             Column('_4test', INTEGER),
@@ -1030,7 +1030,7 @@ def test_invalid_attribute_names(self):
 
 
 class SimpleItem(Base):
-    __tablename__ = 'simple_items'
+    __tablename__ = 'simple-items'
 
     id_test = Column('id-test', Integer, primary_key=True)
     _4test = Column('4test', Integer)
