Support for Django 3.1 (#170)

* Support for Django 3.1

* django-viewflow creates malformed meta object on CompositeKey. Compensating for this.

* IDENT_CURRENT for IBM DB2

Author: RossRogers

README.rst

@@ -14,6 +14,7 @@ Features
 --------
 
 * [x] Alpha support for Django 2.0 via ``pip install django-pyodbc>=2.0.0a1``
+* [x] Alpha support for Django 3.1 via ``pip install django-pyodbc>=2.0.0a2``
 * [x] Support for Django 1.4-1.10.
 * [x] Support for SQL Server 2000, 2005, 2008, and 2012 (please let us know if you have success running this backend with another version of SQL Server)
 * [x] Support for Openedge 11.6

django_pyodbc/base.py

@@ -84,6 +84,8 @@
 
 if DjangoVersion[:2] == (2, 0):
     _DJANGO_VERSION = 20
+elif DjangoVersion[:2] == (3, 1):
+    _DJANGO_VERSION = 31
 else:
     if DjangoVersion[0] == 1:
         raise ImproperlyConfigured("Django %d.%d " % DjangoVersion[:2] +
@@ -439,7 +441,7 @@ def __init__(self, cursor, driver_supports_utf8, encoding="", db_wrpr=None):
     def close(self):
         try:
             self.cursor.close()
-        except Database.ProgrammingError:
+        except:
             pass
 
     def format_sql(self, sql, n_params=None):

django_pyodbc/compat.py

@@ -71,13 +71,13 @@
 
 # new modules from Django1.5
 try:
-    from django.utils.six import PY3
+    from six import PY3
     _py3 = PY3
 except ImportError:
     _py3 = False
 
 try:
-    from django.utils.six import b, binary_type, string_types, text_type
+    from six import b, binary_type, string_types, text_type
 except ImportError:
     b = lambda s: s
     binary_type = str

django_pyodbc/compiler.py

@@ -510,7 +510,7 @@ def _fix_insert(self, sql, params):
         """
         meta = self.query.get_meta()
 
-        if meta.has_auto_field:
+        if getattr(meta, 'has_auto_field',False):
             if hasattr(self.query, 'fields'):
                 # django 1.4 replaced columns with fields
                 fields = self.query.fields
@@ -583,7 +583,7 @@ def as_sql_legacy(self):
         sql = ' '.join(result)
 
         meta = self.query.get_meta()
-        if meta.has_auto_field:
+        if getattr(meta, 'has_auto_field',False):
             # db_column is None if not explicitly specified by model field
             auto_field_column = meta.auto_field.db_column or meta.auto_field.column
 
@@ -651,7 +651,7 @@ def as_sql(self):
         # This section deals with specifically setting the primary key,
         # or using default values if necessary
         meta = self.query.get_meta()
-        if meta.has_auto_field:
+        if getattr(meta, 'has_auto_field',False):
             # db_column is None if not explicitly specified by model field
             auto_field_column = meta.auto_field.db_column or meta.auto_field.column
             out = []

django_pyodbc/metadata.py

@@ -26,7 +26,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "2.0.0a1"
+__version__ = "2.0.0a2"
 __maintainer__ = "Dan Loewenherz"
 __maintainer_email__ = "[email protected]"
 __license__ = "BSD 3-Clause License"

django_pyodbc/operations.py

@@ -261,7 +261,10 @@ def last_insert_id(self, cursor, table_name, pk_name):
         # @@IDENTITY is not limited to a specific scope.
 
         table_name = self.quote_name(table_name)
-        cursor.execute("SELECT CAST(IDENT_CURRENT(%s) as bigint)", [table_name])
+        if self._is_db2:
+            cursor.execute("SELECT CAST(IDENTITY_VAL_LOCAL() as bigint) from %s" % table_name)
+        else:
+            cursor.execute("SELECT py(IDENT_CURRENT(%s) as bigint)", [table_name])
         return cursor.fetchone()[0]
 
     def fetch_returned_insert_id(self, cursor):

setup.py

@@ -50,7 +50,7 @@
     "Operating System :: MacOS :: MacOS X",
     "Operating System :: OS Independent",
     "Operating System :: Unix",
-    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.9",
     "Topic :: Software Development :: Libraries",
 ]
 
@@ -71,5 +71,6 @@
     ],
     install_requires=[
         'pyodbc>=3.0.6,<4.1',
+        'six>=1.15.0'
     ]
 )