Ticket #6161: oracle_qsrf_patch.diff

branches/queryset-refactor/django/db/backends/oracle/base.py

@@ -93 +93 @@
-        return 30
-
-    def query_set_class(self, DefaultQuerySet):
-from django.db import connection
-from django.db.models.query import EmptyResultSet, GET_ITERATOR_CHUNK_SIZE, quote_only_if_word
+# Getting the DefaultQuery class.
+DefaultQuery = DefaultQuerySet().query.__class__
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            def resolve_columns(self, row, fields=()):
-                from django.db.models.fields import DateField, DateTimeField, \
-
+ 
-                values = []
-                for value, field in map(None, row, fields):
-                    if isinstance(value, Database.LOB):
@@ -325 +143 @@
-                    values.append(value)
-                return values
-
+            def as_sql(self, with_limits=True):
+                """
+                Creates the SQL for this query. Returns the SQL string and list of
+                parameters.  This is overriden from the original Query class to
+                accommodate Oracle's limit/offset SQL.
+                
+                If 'with_limits' is False, any limit/offset information is not included
+                in the query.
+                """
+                # The quotename function and the `do_offset` flag, required for the
+                # quirky SQL needed to perform limits/offsets in Oracle.
+                qn = self.quote_name_unless_alias
+                do_offset = with_limits and (self.high_mark or self.low_mark)
+
+                self.pre_sql_setup()
+                out_cols = self.get_columns()
+                ordering = self.get_ordering()
+                # This must come after 'select' and 'ordering' -- see docstring of
+                # get_from_clause() for details.
+                from_, f_params = self.get_from_clause()
+                where, w_params = self.where.as_sql(qn=qn)
+
+                result = ['SELECT']
+                if self.distinct:
+                    result.append('DISTINCT')
+                result.append(', '.join(out_cols))
+
+                # To do the equivalent of limit/offset queries in Oracle requires
+                # selecting an additional row number with the full query, and then
+                # limiting the selection based on row number.
+                if do_offset:
+                    # Inserting the extra SELECT.
+                    result.insert(0, 'SELECT * FROM\n (')
+                    if ordering:
+                        rn_orderby = ', '.join(ordering)
+                    else:
+                        # Oracle's row_number() function always requires an order-by clause.
+                        # So we need to define a default order-by, since none was provided.
+                        opts = self.model._meta
+                        rn_orderby = '%s.%s' % (qn(opts.db_table), qn(opts.fields[0].db_column or opts.fields[0].column))
+                    # Appending the ROW_NUMBER() SQL into the extra select.
+                    result.append(',\n ROW_NUMBER() OVER (ORDER BY %s ) AS rn\n' % rn_orderby)
+
+                # Now adding on the regular FROM statement.
+                result.append('FROM')
+                result.extend(from_)
+                params = list(f_params)
+
+                if where:
+                    result.append('WHERE %s' % where)
+                if self.extra_where:
+                    if not where:
+                        result.append('WHERE')
+                    else:
+                        result.append('AND')
+                    result.append(' AND'.join(self.extra_where))
+                params.extend(w_params)
+
+                if self.group_by:
+                    grouping = self.get_grouping()
+                    result.append('GROUP BY %s' % ', '.join(grouping))
+
+                if ordering:
+                    result.append('ORDER BY %s' % ', '.join(ordering))
+
+                if do_offset:
+                    # Closing off the extra SELECT placed in above that gets the
+                    # row number (`rn`) and place WHERE condition on `rn` for the
+                    # desired range.
+                    result.append(')\n WHERE rn > %d' % self.low_mark)
+                    if self.high_mark:
+                        result.append('AND rn <= %d' % self.high_mark)
+
+                params.extend(self.extra_params)
+                return ' '.join(result), tuple(params)
+              
+        from django.db import connection
+        class OracleQuerySet(DefaultQuerySet):
+            "The OracleQuerySet is overriden to use OracleQuery."
+            def __init__(self, model=None, query=None):
+                super(OracleQuerySet, self).__init__(model=model, query=query)
+                self.query = query or OracleQuery(self.model, connection)
+
-        return OracleQuerySet
-
-    def quote_name(self, name):
@@ -446 +347 @@
-    charset = 'utf-8'
-
-    def _format_params(self, params):
+        sz_kwargs, result = {}, {}
-        if isinstance(params, dict):
-            result = {}
-            charset = self.charset
-            for key, value in params.items():
-                result[smart_str(key, charset)] = smart_str(value, charset)
-return result
+    if hasattr(value, 'oracle_type'): sz_kwargs[key] = value.oracle_type()
-        else:
-
+
+
+
+
-
+        # If any of the parameters had an `oracle_type` method, then we set
+        # the inputsizes for those parameters using the returned type
+        if sz_kwargs: self.setinputsizes(**sz_kwargs)
+        return result
+
-    def execute(self, query, params=None):
-        if params is None:
-            params = []
@@ -472 +381 @@
-
-    def executemany(self, query, params=None):
-        try:
-
+  
-        except (IndexError, TypeError):
-
-
+  
+  
-        # cx_Oracle wants no trailing ';' for SQL statements.  For PL/SQL, it
-        # it does want a trailing ';' but not a trailing '/'.  However, these
-        # characters must be included in the original query in case the query