Changeset 1581

Timestamp:

12/08/05 21:08:51 (3 years ago)

Author:

adrian

Message:

Fixed #967 -- 'tables' parameter in DB API is now only quoted if needed. Thanks, Russell Keith-Magee

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/meta/__init__.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -57 +57 @@
-    Jason Huggins <http://www.jrandolph.com/blog/>
-    Michael Josephson <http://www.sdjournal.com/>
+    Russell Keith-Magee <freakboy@iinet.net.au>
-    Garth Kidd <http://www.deadlybloodyserious.com/>
-    Sune Kirkeby <http://ibofobi.dk/>

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

@@ -1585 +1585 @@
-
-def function_get_sql_clause(opts, **kwargs):
+    def quote_only_if_word(word):
+        if ' ' in word:
+            return word
+        else:
+            return db.db.quote_name(word)
+
+    # Construct the fundamental parts of the query: SELECT X FROM Y WHERE Z.
-    select = ["%s.%s" % (db.db.quote_name(opts.db_table), db.db.quote_name(f.column)) for f in opts.fields]
-    tables = [opts.db_table] + (kwargs.get('tables') and kwargs['tables'][:] or [])
-db.db.quote_name
+quote_only_if_word
-    where = kwargs.get('where') and kwargs['where'][:] or []
-    params = kwargs.get('params') and kwargs['params'][:] or []
@@ -1605 +1612 @@
-
-    # Add any additional SELECTs passed in via kwargs.
-    def quote_only_if_word(word):
-        if word.find(' ')>=0:
-            return word
-        else:
-            return db.db.quote_name(word)
-    if kwargs.get('select'):
-        select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']])