From 2e396bdbe888ad87594b584498441956279c8220 Mon Sep 17 00:00:00 2001 From: Gorah Date: Mon, 11 Mar 2013 19:46:58 +0100 Subject: [PATCH 1/4] fixed versioning --- sql_server/pyodbc/base.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py index 7270a509..edee47f0 100644 --- a/sql_server/pyodbc/base.py +++ b/sql_server/pyodbc/base.py @@ -21,26 +21,21 @@ from django.db.backends.signals import connection_created from django.conf import settings from django import VERSION as DjangoVersion -if DjangoVersion[:2] == (1,4): - # Django version 1.4 adds a backwards incompatible change to - # DatabaseOperations - _DJANGO_VERSION = 14 -elif DjangoVersion[:2] == (1,2) : + +"""Versioning script - added support for v.12""" + +_DJANGO_VERSION = str(DjangoVersion[0]) + str(DjangoVersion[2]) +_DJANGO_VERSION=int(_DJANGO_VERSION) + +if _DJANGO_VERSION == 12: from django import get_version version_str = get_version() - if 'SVN' in version_str and int(version_str.split('SVN-')[-1]) < 11952: # django trunk revision 11952 Added multiple database support. + + if 'SVN' in version_str and int(version_str.split('SVN-')[-1]) < 11952: _DJANGO_VERSION = 11 else: _DJANGO_VERSION = 12 -elif DjangoVersion[:2] == (1,1): - _DJANGO_VERSION = 11 -elif DjangoVersion[:2] == (1,0): - _DJANGO_VERSION = 10 -elif DjangoVersion[0] == 1: - _DJANGO_VERSION = 13 -else: - _DJANGO_VERSION = 9 - + from sql_server.pyodbc.operations import DatabaseOperations from sql_server.pyodbc.client import DatabaseClient from sql_server.pyodbc.creation import DatabaseCreation From dbcef9c27cbca346c78650ba5aa1ab2d9e60cfe3 Mon Sep 17 00:00:00 2001 From: Gorah Date: Mon, 11 Mar 2013 19:52:00 +0100 Subject: [PATCH 2/4] fixed ordering --- sql_server/pyodbc/compiler.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql_server/pyodbc/compiler.py b/sql_server/pyodbc/compiler.py index a45e56d1..baa6b84e 100644 --- a/sql_server/pyodbc/compiler.py +++ b/sql_server/pyodbc/compiler.py @@ -165,7 +165,8 @@ def _as_sql(self, strategy): result.append('WHERE %s' % where) params.extend(w_params) - grouping, gb_params = self.get_grouping() + #fixed ordering group - thanks Elessar Webb from GitHub + grouping, gb_params = self.get_grouping(ordering_group_by) if grouping: if ordering: # If the backend can't group by PK (i.e., any database From a5868db1dcf24618c2cce02959b197e238ba3234 Mon Sep 17 00:00:00 2001 From: Gorah Date: Mon, 11 Mar 2013 21:09:43 +0100 Subject: [PATCH 3/4] fixed index --- sql_server/pyodbc/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py index edee47f0..cec1dc81 100644 --- a/sql_server/pyodbc/base.py +++ b/sql_server/pyodbc/base.py @@ -24,7 +24,7 @@ """Versioning script - added support for v.12""" -_DJANGO_VERSION = str(DjangoVersion[0]) + str(DjangoVersion[2]) +_DJANGO_VERSION = str(DjangoVersion[0]) + str(DjangoVersion[1]) _DJANGO_VERSION=int(_DJANGO_VERSION) if _DJANGO_VERSION == 12: From 23d00541f66b7ca924ec3e5eb26158cab49dc030 Mon Sep 17 00:00:00 2001 From: Gorah Date: Mon, 11 Mar 2013 21:19:47 +0100 Subject: [PATCH 4/4] removed support for django v0.9 --- sql_server/pyodbc/base.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sql_server/pyodbc/base.py b/sql_server/pyodbc/base.py index cec1dc81..675da6e8 100644 --- a/sql_server/pyodbc/base.py +++ b/sql_server/pyodbc/base.py @@ -22,11 +22,13 @@ from django.conf import settings from django import VERSION as DjangoVersion -"""Versioning script - added support for v.12""" +"""Versioning script - removed hardcoded versioning +!!!Support for Django versions <1.0 is now dropped!!!""" _DJANGO_VERSION = str(DjangoVersion[0]) + str(DjangoVersion[1]) _DJANGO_VERSION=int(_DJANGO_VERSION) + if _DJANGO_VERSION == 12: from django import get_version version_str = get_version()