Merge pull request #48 from apanly/master

support SQLAlchemy 2.0 and Support Python 3.9

Author: ksindi

README.md

@@ -1,6 +1,15 @@
 # Flask sqlacodegen
 
 Fork of [sqlacodegen](https://pypi.python.org/pypi/sqlacodegen) by Alex Gronholm. Based off of version 1.1.6.
+> Now Support Python 3.9 or lastest 
+
+> Now Support SQLAlchemy 2.0 or lastest
+
+Thanks
+
+* https://github.com/maacck/sqlacodegen_v2/
+* https://github.com/ksindi/flask-sqlacodegen/pull/47
+
 
 What's different:
 

setup.py

@@ -45,13 +45,16 @@ def run_tests(self):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     keywords=['sqlalchemy', 'sqlacodegen', 'flask'],
     license='MIT',
     packages=find_packages(exclude=['tests']),
     install_requires=(
-        'SQLAlchemy >= 0.6.0',
-        'inflect >= 0.2.0'
+        "SQLAlchemy >= 2.0",
+        "inflect >= 4.0.0",
     ) + extra_requirements,
     tests_require=['pytest', 'pytest-pep8'],
     cmdclass={'test': PyTest},

sqlacodegen/codegen.py

@@ -1,7 +1,6 @@
 """Contains the code generation logic and helper functions."""
 from __future__ import unicode_literals, division, print_function, absolute_import
 from collections import defaultdict
-from inspect import ArgSpec
 from keyword import iskeyword
 import inspect
 import sys
@@ -95,12 +94,12 @@ def _get_common_fk_constraints(table1, table2):
 
 def _getargspec_init(method):
     try:
-        return inspect.getargspec(method)
+        return inspect.getfullargspec(method)
     except TypeError:
         if method is object.__init__:
-            return ArgSpec(['self'], None, None, None)
+            return inspect.getfullargspec(lambda self: None)
         else:
-            return ArgSpec(['self'], 'args', 'kwargs', None)
+            return inspect.getfullargspec(lambda self, *args, **kwargs: None)
 
 
 def _render_column_type(coltype):

sqlacodegen/main.py

@@ -56,7 +56,7 @@ def main():
 
     engine = create_engine(args.url)
     import_dialect_specificities(engine)
-    metadata = MetaData(engine, False, default_schema)
+    metadata = MetaData()
     tables = args.tables.split(',') if args.tables else None
     ignore_cols = args.ignore_cols.split(',') if args.ignore_cols else None
     metadata.reflect(engine, args.schema, not args.noviews, tables)