Ticket #1990: django_oracle3545.patch

db/models/base.py

@@ -171 +171 @@
-        record_exists = True
-        if pk_set:
-            # Determine whether a record with the primary key already exists.
-
-
+
+
+
-            # If it does already exist, do an UPDATE.
-            if cursor.fetchone():
-                db_values = [f.get_db_prep_save(f.pre_save(self, False)) for f in non_pks]

db/models/fields/__init__.py

@@ -158 +158 @@
-
-    def get_db_prep_save(self, value):
-        "Returns field's value prepared for saving into a database."
+        # Oracle treats empty strings ('') the same as NULLs. 
+        # To get around this wart, we need to change it to something else... 
+        if settings.DATABASE_ENGINE == 'oracle' and  value == '':
+            value = ' '
-        return value
-
-    def get_db_prep_lookup(self, lookup_type, value):
@@ -449 +453 @@
-    def get_db_prep_save(self, value):
-        # Casts dates into string format for entry into database.
-        if value is not None:
-
+
+
+
-        return Field.get_db_prep_save(self, value)
-
-    def get_manipulator_field_objs(self):
@@ -479 +485 @@
-    def get_db_prep_save(self, value):
-        # Casts dates into string format for entry into database.
-        if value is not None:
-
+/Oracle
-            # doesn't support microseconds.
-settings.DATABASE_ENGINE == 'mysql'
+(settings.DATABASE_ENGINE == 'mysql' or settings.DATABASE_ENGINE=='oracle')
-                value = value.replace(microsecond=0)
-            value = str(value)
-        return Field.get_db_prep_save(self, value)
-
-    def get_db_prep_lookup(self, lookup_type, value):
+        # Oracle will throw an error if microseconds are given, because it
+        # doesn't support microseconds.
+        if (settings.DATABASE_ENGINE=='oracle') and hasattr(value, 'microsecond'):
+            value = value.replace(microsecond=0)
-        if lookup_type == 'range':
-            value = [str(v) for v in value]
-        else:
@@ -514 +524 @@
-    def flatten_data(self,follow, obj = None):
-        val = self._get_val_from_obj(obj)
-        date_field, time_field = self.get_manipulator_field_names('')
-
-
+
+
+
+
+
+
+
-
-class EmailField(CharField):
-    def __init__(self, *args, **kwargs):
@@ -747 +762 @@
-            # doesn't support microseconds.
-            if settings.DATABASE_ENGINE == 'mysql':
-                value = value.replace(microsecond=0)
-
+
+
+
+
+
-        return Field.get_db_prep_save(self, value)
-
-    def get_manipulator_field_objs(self):

db/models/query.py

@@ -3 +3 @@
-from django.db.models import signals
-from django.dispatch import dispatcher
-from django.utils.datastructures import SortedDict
+from django.conf import settings
-import operator
-import re
-
@@ -168 +169 @@
-        extra_select = self._select.items()
-
-        cursor = connection.cursor()
-
-
+
+
+
+
+
+
-        fill_cache = self._select_related
-        index_end = len(self.model._meta.fields)
-        while 1:
@@ -192 +197 @@
-        counter._offset = None
-        counter._limit = None
-        counter._select_related = False
- = counter._get_sql_clause()
+, full_query = counter._get_sql_clause() 
-        cursor = connection.cursor()
-        if self._distinct:
-            id_col = "%s.%s" % (backend.quote_name(self.model._meta.db_table),
@@ -501 +506 @@
-            sql.append("ORDER BY " + ", ".join(order_by))
-
-        # LIMIT and OFFSET clauses
-
-
+
+
+
+
+
+
+
-        else:
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+            if len(limit_and_offset_clause) > 0: 
+                full_query = """SELECT * FROM  
+                    (SELECT %s    
+                    %s, 
+                    ROW_NUMBER() %s AS rn 
+                    %s 
+                    ) 
+                    %s 
+                    """ % (distinct, select_clause, order_by_clause, " ".join(sql), limit_and_offset_clause)
+            else:
+                full_query = None 
+             
+            return select, " ".join(sql), params, full_query
-class ValuesQuerySet(QuerySet):
-    def iterator(self):
-        # select_related and select aren't supported in values().
@@ -523 +563 @@
-            field_names = [f.attname for f in self.model._meta.fields]
-
-        cursor = connection.cursor()
- = self._get_sql_clause()
+, full_query = self._get_sql_clause() 
-        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)
-        while 1:
@@ -636 +676 @@
-    if table_prefix.endswith('.'):
-        table_prefix = backend.quote_name(table_prefix[:-1])+'.'
-    field_name = backend.quote_name(field_name)
+    #put some oracle exceptions here 
+    if lookup_type == "icontains" and settings.DATABASE_ENGINE == 'oracle': 
+        return 'lower(%s%s) %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s')) 
-    try:
-        return '%s%s %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
-    except KeyError:
@@ -667 +710 @@
-    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:
@@ -680 +724 @@
-            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)))
-
+
+
+
+
-            fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
-
-def parse_lookup(kwarg_items, opts):

db/backends/oracle/base.py

@@ -39 +39 @@
-            else:
-                conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
-                self.connection = Database.connect(conn_string)
+        # set oracle date to ansi date format
+        cursor =  self.connection.cursor()
+        cursor.execute("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'")
+        cursor.close()                                       
-        return FormatStylePlaceholderCursor(self.connection)
-
-    def _commit(self):
@@ -67 +71 @@
-    def execute(self, query, params=None):
-        if params is None: params = []
-        query = self.convert_arguments(query, len(params))
-
+
+
+
+
+
+
-
-    def executemany(self, query, params=None):
-        if params is None: params = []
-        query = self.convert_arguments(query, len(params[0]))
+        # cx can not execute the query with the closing ';' 
+        if query.endswith(';') :
+            query = query[0:len(query)-1]                                                   
-        return Database.Cursor.executemany(self, query, params)
-
-    def convert_arguments(self, query, num_params):

core/management.py

@@ -6 +6 @@
-import os, re, shutil, sys, textwrap
-from optparse import OptionParser
-from django.utils import termcolors
+from django.conf import settings
-
-# For Python 2.3
-if not hasattr(__builtins__, 'set'):
@@ -83 +84 @@
-
-def get_sql_create(app):
-    "Returns a list of the CREATE TABLE SQL statements for the given app."
-get_creation_module, models
+models,get_creation_module, backend
-    data_types = get_creation_module().DATA_TYPES
-
-    if not data_types:
@@ -187 +188 @@
-        full_statement.append('    %s%s' % (line, i < len(table_output)-1 and ',' or ''))
-    full_statement.append(');')
-    final_output.append('\n'.join(full_statement))
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return final_output, pending_references
-
-def _get_sql_for_pending_references(model, pending_references):
@@ -210 +224 @@
-                # For MySQL, r_name must be unique in the first 64 characters.
-                # So we are careful with character usage here.
-                r_name = '%s_refs_%s_%x' % (r_col, col, abs(hash((r_table, table))))
-
+
+
+
+
+
+
+
-                    (backend.quote_name(r_table), r_name,
-                    backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col)))
-            del pending_references[model]
@@ -250 +270 @@
-                style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name()))))
-            table_output.append(');')
-            final_output.append('\n'.join(table_output))
+        # To simulate auto-incrementing primary keys in Oracle -- creating m2m tables
+        if (settings.DATABASE_ENGINE == 'oracle'):
+            m_table = f.m2m_db_table()
+            sequence_statement = 'CREATE SEQUENCE %s_sq;' % m_table
+            final_output.append(sequence_statement)
+            trigger_statement = '' + \
+            'CREATE OR REPLACE trigger %s_tr\n'    % m_table + \
+            '  before insert on %s\n'           % backend.quote_name(m_table) + \
+            '    for each row\n'  + \
+            '      when (new.id is NULL)\n' + \
+            '        begin\n' + \
+            '         select %s_sq.NEXTVAL into :new.id from DUAL;\n' % m_table + \
+            '      end;\n'
+            final_output.append(trigger_statement)
-    return final_output
-
-def get_sql_delete(app):
@@ -473 +507 @@
-            sql.extend(_get_sql_for_pending_references(model, pending_references))
-            print "Creating table %s" % model._meta.db_table
-            for statement in sql:
-
+
+
+
+
+
+
-            table_list.append(model._meta.db_table)
-
-        for model in model_list:
@@ -1289 +1328 @@
-        if not mod_list:
-            parser.print_usage_and_exit()
-        if action not in NO_SQL_TRANSACTION:
-
+
+
-        for mod in mod_list:
-            output = action_mapping[action](mod)
-            if output:
-                print '\n'.join(output)
-        if action not in NO_SQL_TRANSACTION:
-
+
+
-
-def setup_environ(settings_mod):
-    """

contrib/sessions/models.py

@@ -51 +51 @@
-    session_key = models.CharField(_('session key'), maxlength=40, primary_key=True)
-    session_data = models.TextField(_('session data'))
-    expire_date = models.DateTimeField(_('expire date'))
+
-    objects = SessionManager()
-    class Meta:
-        db_table = 'django_session'

contrib/admin/models.py

@@ -16 +16 @@
-    action_time = models.DateTimeField(_('action time'), auto_now=True)
-    user = models.ForeignKey(User)
-    content_type = models.ForeignKey(ContentType, blank=True, null=True)
-
+
+
-    object_repr = models.CharField(_('object repr'), maxlength=200)
-    action_flag = models.PositiveSmallIntegerField(_('action flag'))
-    change_message = models.TextField(_('change message'), blank=True)