Changeset 541

Timestamp:

08/19/05 16:51:14 (3 years ago)

Author:

adrian

Message:

Fixed #350 -- 'offset' DB API parameter now works in MySQL 3. Tests from [540] pass. Thanks, ronan@cremin.com

Files:

• django/trunk/django/core/db/backends/mysql.py (modified) (1 diff)
• django/trunk/django/core/db/backends/postgresql.py (modified) (1 diff)
• django/trunk/django/core/db/backends/sqlite3.py (modified) (1 diff)
• django/trunk/django/core/db/__init__.py (modified) (1 diff)
• django/trunk/django/core/meta/__init__.py (modified) (1 diff)

django/trunk/django/core/db/backends/mysql.py

@@ -71 +71 @@
-        subtractions.append(" - interval (DATE_FORMAT(%s, '%%%%m')-1) month" % field_name)
-    return "(%s - %s)" % (field_name, ''.join(subtractions))
+
+def get_limit_offset_sql(limit, offset=None):
+    sql = "LIMIT "
+    if offset and offset != 0:
+        sql += "%s," % offset
+    return sql + str(limit)
-
-def get_table_list(cursor):

django/trunk/django/core/db/backends/postgresql.py

@@ -71 +71 @@
-    # http://www.postgresql.org/docs/8.0/static/functions-datetime.html#FUNCTIONS-DATETIME-TRUNC
-    return "DATE_TRUNC('%s', %s)" % (lookup_type, field_name)
+
+def get_limit_offset_sql(limit, offset=None):
+    sql = "LIMIT %s" % limit
+    if offset and offset != 0:
+        sql += " OFFSET %s" % offset
+    return sql
-
-def get_table_list(cursor):

django/trunk/django/core/db/backends/sqlite3.py

@@ -98 +98 @@
-    return 'django_date_trunc("%s", %s)' % (lookup_type.lower(), field_name)
-
+def get_limit_offset_sql(limit, offset=None):
+    sql = "LIMIT %s" % limit
+    if offset and offset != 0:
+        sql += " OFFSET %s" % offset
+    return sql
+
-def _sqlite_date_trunc(lookup_type, dt):
-    try:

django/trunk/django/core/db/__init__.py

@@ -38 +38 @@
-get_date_extract_sql = dbmod.get_date_extract_sql
-get_date_trunc_sql = dbmod.get_date_trunc_sql
+get_limit_offset_sql = dbmod.get_limit_offset_sql
-get_table_list = dbmod.get_table_list
-get_relations = dbmod.get_relations

django/trunk/django/core/meta/__init__.py

@@ -1278 +1278 @@
-    # LIMIT and OFFSET clauses
-    if kwargs.get('limit') is not None:
-
-
-
+
-    else:
+        assert kwargs.get('offset') is None, "'offset' is not allowed without 'limit'"
-        limit_sql = ""
-