Changeset 4022

Timestamp:

11/06/06 01:38:57 (2 years ago)

Author:

bouldersprinters

Message:

[boulder-oracle-sprint] Oracle passes most of runtests.py now.

Files:

• django/branches/boulder-oracle-sprint/django/db/backends/oracle/query.py (modified) (3 diffs)
• django/branches/boulder-oracle-sprint/django/db/models/query.py (modified) (5 diffs)

django/branches/boulder-oracle-sprint/django/db/backends/oracle/query.py

@@ -1 +1 @@
-from django.db import backend, connection
-
+
+
+
-from django.utils.datastructures import SortedDict
-import cx_Oracle as Database
-
-
+def get_cached_row(klass, row, index_start):
+    "Helper function that recursively returns an object with cache filled"
+    index_end = index_start + len(klass._meta.fields)
+    obj = klass(*row[index_start:index_end])
+    for f in klass._meta.fields:
+        if f.rel and not f.null:
+            rel_obj, index_end = get_cached_row(f.rel.to, row, index_end)
+            setattr(obj, f.get_cache_name(), rel_obj)
+    return obj, index_end
+
+
+def fill_table_cache(opts, select, tables, where, old_prefix, cache_tables_seen):
+    """
+    Helper function that recursively populates the select, tables and where (in
+    place) for select_related queries.
+    """
+    from django.db.models.fields import AutoField 
+    qn = backend.quote_name
+    for f in opts.fields:
+        if f.rel and not f.null:
+            db_table = f.rel.to._meta.db_table
+            if db_table not in cache_tables_seen:
+                tables.append(qn(db_table))
+            else: # The table was already seen, so give it a table alias.
+                new_prefix = '%s%s' % (db_table, len(cache_tables_seen))
+                tables.append('%s %s' % (qn(db_table), qn(new_prefix)))
+                db_table = new_prefix
+            cache_tables_seen.append(db_table)
+            where.append('%s.%s = %s.%s' % \
+                (qn(old_prefix), qn(f.column), qn(db_table), qn(f.rel.get_related_field().column)))
+            select.extend(['%s.%s' % (backend.quote_name(db_table), backend.quote_name(f2.column)) for f2 in f.rel.to._meta.fields if not isinstance(f2, AutoField)]) 
+            fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
+
+
-def get_query_set_class(DefaultQuerySet):
-
-
-
+
-    
-    class OracleQuerySet(DefaultQuerySet):
+        
-        def iterator(self):
-            "Performs the SELECT database lookup of this QuerySet."
@@ -61 +96 @@
-            where = self._where[:]
-            params = self._params[:]
-
+    
-            # Convert self._filters into SQL.
-            joins2, where2, params2 = self._filters.get_sql(opts)
@@ -157 +192 @@
-             
-            return select, " ".join(sql), params, full_query
-
-
+
-    return OracleQuerySet

django/branches/boulder-oracle-sprint/django/db/models/query.py

@@ -6 +6 @@
-from django.utils.datastructures import SortedDict
-from django.conf import settings
-
-
+
-
-# For Python 2.3
@@ -198 +197 @@
-        counter._limit = None
-        counter._select_related = False
-
-
-
-
+
-        cursor = connection.cursor()
-        if self._distinct:
@@ -540 +536 @@
-
-        cursor = connection.cursor()
-
-
-
-
+
-        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
-        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
@@ -656 +649 @@
-        table_prefix = backend.quote_name(table_prefix[:-1])+'.'
-    field_name = backend.quote_name(field_name)
-
-
-
+
+
+
+
+
+
+
-    try:
-        return '%s%s %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
@@ -704 +701 @@
-            where.append('%s.%s = %s.%s' % \
-                (qn(old_prefix), qn(f.column), qn(db_table), qn(f.rel.get_related_field().column)))
-
-
-
-
+
-            fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
-