Ticket #1990: django_oracle_rev3496.patch

File django_oracle_rev3496.patch, 15.8 KB (added by pk11, 9 years ago)
  • db/models/base.py

     
    171171        record_exists = True
    172172        if pk_set:
    173173            # Determine whether a record with the primary key already exists.
    174             cursor.execute("SELECT 1 FROM %s WHERE %s=%%s LIMIT 1" % \
    175                 (backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column)), [pk_val])
     174            lim = settings.DATABASE_ENGINE != 'oracle' and ' LIMIT 1' or ''
     175            cursor.execute("SELECT 1 FROM %s WHERE %s=%%s %s" % \
     176                (backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column), lim), [pk_val])
    176177            # If it does already exist, do an UPDATE.
    177178            if cursor.fetchone():
    178179                db_values = [f.get_db_prep_save(f.pre_save(self, False)) for f in non_pks]
  • db/models/fields/__init__.py

     
    158158
    159159    def get_db_prep_save(self, value):
    160160        "Returns field's value prepared for saving into a database."
     161        # Oracle treats empty strings ('') the same as NULLs.
     162        # To get around this wart, we need to change it to something else...
     163        if settings.DATABASE_ENGINE == 'oracle' and  value == '':
     164            value = ' '
    161165        return value
    162166
    163167    def get_db_prep_lookup(self, lookup_type, value):
     
    446450    def get_db_prep_save(self, value):
    447451        # Casts dates into string format for entry into database.
    448452        if value is not None:
    449             value = value.strftime('%Y-%m-%d')
     453            if settings.DATABASE_ENGINE != 'oracle':
     454                #Oracle does not need a string conversion
     455                value = value.strftime('%Y-%m-%d')
    450456        return Field.get_db_prep_save(self, value)
    451457
    452458    def get_manipulator_field_objs(self):
     
    744750            # doesn't support microseconds.
    745751            if settings.DATABASE_ENGINE == 'mysql':
    746752                value = value.replace(microsecond=0)
    747             value = str(value)
     753                value = str(value)
     754            elif settings.DATABASE_ENGINE == 'oracle':
     755                value = value.replace(microsecond=0)
     756            else:
     757                value = str(value)
    748758        return Field.get_db_prep_save(self, value)
    749759
    750760    def get_manipulator_field_objs(self):
  • db/models/query.py

     
    33from django.db.models import signals
    44from django.dispatch import dispatcher
    55from django.utils.datastructures import SortedDict
     6from django.conf import settings
    67import operator
    78import re
    89
     
    168169        extra_select = self._select.items()
    169170
    170171        cursor = connection.cursor()
    171         select, sql, params = self._get_sql_clause()
    172         cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
     172        select, sql, params, full_query = self._get_sql_clause()
     173
     174        if not full_query:
     175            cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
     176        else:
     177            cursor.execute(full_query, params)
    173178        fill_cache = self._select_related
    174179        index_end = len(self.model._meta.fields)
    175180        while 1:
     
    192197        counter._offset = None
    193198        counter._limit = None
    194199        counter._select_related = False
    195         select, sql, params = counter._get_sql_clause()
     200        select, sql, params, full_query = counter._get_sql_clause()
    196201        cursor = connection.cursor()
    197202        if self._distinct:
    198203            id_col = "%s.%s" % (backend.quote_name(self.model._meta.db_table),
     
    501506            sql.append("ORDER BY " + ", ".join(order_by))
    502507
    503508        # LIMIT and OFFSET clauses
    504         if self._limit is not None:
    505             sql.append("%s " % backend.get_limit_offset_sql(self._limit, self._offset))
     509        if (settings.DATABASE_ENGINE != 'oracle'):             
     510            if self._limit is not None:
     511                sql.append("%s " % backend.get_limit_offset_sql(self._limit, self._offset))
     512            else:
     513                assert self._offset is None, "'offset' is not allowed without 'limit'"
     514
     515            return select, " ".join(sql), params
    506516        else:
    507             assert self._offset is None, "'offset' is not allowed without 'limit'"
     517            # To support limits and offsets, Oracle requires some funky rewriting of an otherwise normal looking query.
     518            select_clause = ",".join(select)
     519            distinct = (self._distinct and "DISTINCT " or "")
    508520
    509         return select, " ".join(sql), params
     521            if order_by: 
     522                order_by_clause = " OVER (ORDER BY %s )" % (", ".join(order_by))
     523            else:
     524                #Oracle's row_number() function always requires an order-by clause.
     525                #So we need to define a default order-by, since none was provided.
     526                order_by_clause = " OVER (ORDER BY %s.%s)" % \
     527                    (backend.quote_name(opts.db_table), 
     528                    backend.quote_name(opts.fields[0].db_column or opts.fields[0].column))
     529            # limit_and_offset_clause
     530            offset = self._offset and int(self._offset) or 0
     531            limit = self._limit and int(self._limit) or None
     532            limit_and_offset_clause = ''
     533            if limit:
     534                limit_and_offset_clause = "WHERE rn > %s AND rn <= %s" % (offset, limit+offset)
     535            else offset:
     536                limit_and_offset_clause = "WHERE rn > %s" % (offset)
    510537
     538            if len(limit_and_offset_clause) > 0:
     539                full_query = """SELECT * FROM 
     540                    (SELECT %s   
     541                    %s,
     542                    ROW_NUMBER() %s AS rn
     543                    %s
     544                    )
     545                    %s
     546                    """ % (distinct, select_clause, order_by_clause, " ".join(sql), limit_and_offset_clause)
     547             else:
     548                 full_query = None
     549             
     550             return select, " ".join(sql), params, full_query
    511551class ValuesQuerySet(QuerySet):
    512552    def iterator(self):
    513553        # select_related and select aren't supported in values().
     
    523563            field_names = [f.attname for f in self.model._meta.fields]
    524564
    525565        cursor = connection.cursor()
    526         select, sql, params = self._get_sql_clause()
     566        select, sql, params, full_query = self._get_sql_clause()
    527567        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
    528568        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
    529569        while 1:
     
    636676    if table_prefix.endswith('.'):
    637677        table_prefix = backend.quote_name(table_prefix[:-1])+'.'
    638678    field_name = backend.quote_name(field_name)
     679    #put some oracle exceptions here
     680    if lookup_type == "icontains" and settings.DATABASE_ENGINE == 'oracle':
     681        return 'lower(%s%s) %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
    639682    try:
    640683        return '%s%s %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
    641684    except KeyError:
     
    667710    Helper function that recursively populates the select, tables and where (in
    668711    place) for select_related queries.
    669712    """
     713    from django.db.models.fields import AutoField
    670714    qn = backend.quote_name
    671715    for f in opts.fields:
    672716        if f.rel and not f.null:
     
    680724            cache_tables_seen.append(db_table)
    681725            where.append('%s.%s = %s.%s' % \
    682726                (qn(old_prefix), qn(f.column), qn(db_table), qn(f.rel.get_related_field().column)))
    683             select.extend(['%s.%s' % (qn(db_table), qn(f2.column)) for f2 in f.rel.to._meta.fields])
     727            if settings.DATABASE_ENGINE == 'oracle':
     728                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)])
     729            else:
     730                select.extend(['%s.%s' % (backend.quote_name(db_table), backend.quote_name(f2.column)) for f2 in f.rel.to._meta.fields])
    684731            fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
    685732
    686733def parse_lookup(kwarg_items, opts):
  • db/backends/oracle/base.py

     
    3939            else:
    4040                conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
    4141                self.connection = Database.connect(conn_string)
     42        # set oracle date to ansi date format
     43        cursor =  self.connection.cursor()
     44        cursor.execute("alter session set nls_date_format = 'YYYY-MM-DD HH24:MI:SS'")
     45        cursor.close()                                       
    4246        return FormatStylePlaceholderCursor(self.connection)
    4347
    4448    def _commit(self):
     
    6771    def execute(self, query, params=None):
    6872        if params is None: params = []
    6973        query = self.convert_arguments(query, len(params))
    70         return Database.Cursor.execute(self, query, params)
     74        # cx can not execute the query with the closing ';'
     75        if query.endswith(';') :
     76            query = query[0:len(query)-1]                               
     77        return Database.Cursor.execute(self, query, params)
    7178
    7279    def executemany(self, query, params=None):
    7380        if params is None: params = []
    7481        query = self.convert_arguments(query, len(params[0]))
     82        # cx can not execute the query with the closing ';'
     83        if query.endswith(';') :
     84            query = query[0:len(query)-1]                                                   
    7585        return Database.Cursor.executemany(self, query, params)
    7686
    7787    def convert_arguments(self, query, num_params):
  • core/management.py

     
    66import os, re, shutil, sys, textwrap
    77from optparse import OptionParser
    88from django.utils import termcolors
     9from django.conf import settings
    910
    1011# For Python 2.3
    1112if not hasattr(__builtins__, 'set'):
     
    8384
    8485def get_sql_create(app):
    8586    "Returns a list of the CREATE TABLE SQL statements for the given app."
    86     from django.db import get_creation_module, models
     87    from django.db import get_creation_module, backend
    8788    data_types = get_creation_module().DATA_TYPES
    8889
    8990    if not data_types:
     
    181182        full_statement.append('    %s%s' % (line, i < len(table_output)-1 and ',' or ''))
    182183    full_statement.append(');')
    183184    final_output.append('\n'.join(full_statement))
    184 
     185    # To simulate auto-incrementing primary keys in Oracle -- creating primary tables
     186    if (settings.DATABASE_ENGINE == 'oracle') & (opts.has_auto_field):
     187        sequence_statement = 'CREATE SEQUENCE %s_sq;' % opts.db_table
     188        final_output.append(sequence_statement)
     189        trigger_statement = '' + \
     190        'CREATE OR REPLACE trigger %s_tr\n'    % opts.db_table + \
     191        '  before insert on %s\n'           % backend.quote_name(opts.db_table) + \
     192        '    for each row\n'  + \
     193        '      when (new.id is NULL)\n' + \
     194        '        begin\n' + \
     195        '         select %s_sq.NEXTVAL into :new.id from DUAL;\n' % opts.db_table + \
     196        '      end;\n'                                                                       
     197        final_output.append(trigger_statement)
     198                             
    185199    return final_output, pending_references
    186200
    187201def _get_sql_for_pending_references(model, pending_references):
     
    208222                    r_name += '_%s' % reference_names[r_name]
    209223                else:
    210224                    reference_names[r_name] = 0
     225                # if constraint name size is over 29 char and db is oracle, chop it
     226                constraint_name = r_name
     227                if settings.DATABASE_ENGINE == 'oracle' and len(constraint_name) > 29:
     228                    constraint_name = constraint_name[0:29]   
    211229                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s);' % \
    212                     (backend.quote_name(r_table), r_name,
     230                    (backend.quote_name(r_table), constraint_name,
    213231                    backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col)))
    214232            del pending_references[model]
    215233    return final_output
     
    248266                style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name()))))
    249267            table_output.append(');')
    250268            final_output.append('\n'.join(table_output))
     269        # To simulate auto-incrementing primary keys in Oracle -- creating m2m tables
     270        if (settings.DATABASE_ENGINE == 'oracle'):
     271            m_table = f.m2m_db_table()
     272            sequence_statement = 'CREATE SEQUENCE %s_sq;' % m_table
     273            final_output.append(sequence_statement)
     274            trigger_statement = '' + \
     275            'CREATE OR REPLACE trigger %s_tr\n'    % m_table + \
     276            '  before insert on %s\n'           % backend.quote_name(m_table) + \
     277            '    for each row\n'  + \
     278            '      when (new.id is NULL)\n' + \
     279            '        begin\n' + \
     280            '         select %s_sq.NEXTVAL into :new.id from DUAL;\n' % m_table + \
     281            '      end;\n'
     282            final_output.append(trigger_statement)
    251283    return final_output
    252284
    253285def get_sql_delete(app):
     
    471503            sql.extend(_get_sql_for_pending_references(model, pending_references))
    472504            print "Creating table %s" % model._meta.db_table
    473505            for statement in sql:
    474                 cursor.execute(statement)
     506            #    go on if one table could not be created
     507                try:
     508                    cursor.execute(statement)
     509                except Exception, e:
     510                    print statement
     511                    print e
    475512            table_list.append(model._meta.db_table)
    476513
    477514        for model in model_list:
     
    12811318        if not mod_list:
    12821319            parser.print_usage_and_exit()
    12831320        if action not in NO_SQL_TRANSACTION:
    1284             print style.SQL_KEYWORD("BEGIN;")
     1321            if settings.DATABASE_ENGINE != 'oracle':
     1322                print style.SQL_KEYWORD("BEGIN;")
    12851323        for mod in mod_list:
    12861324            output = action_mapping[action](mod)
    12871325            if output:
    12881326                print '\n'.join(output)
    12891327        if action not in NO_SQL_TRANSACTION:
    1290             print style.SQL_KEYWORD("COMMIT;")
     1328            if settings.DATABASE_ENGINE != 'oracle':
     1329                print style.SQL_KEYWORD("COMMIT;")
    12911330
    12921331def execute_manager(settings_mod, argv=None):
    12931332    # Add this project to sys.path so that it's importable in the conventional
  • contrib/admin/models.py

     
    1616    action_time = models.DateTimeField(_('action time'), auto_now=True)
    1717    user = models.ForeignKey(User)
    1818    content_type = models.ForeignKey(ContentType, blank=True, null=True)
    19     object_id = models.TextField(_('object id'), blank=True, null=True)
     19    #changed for Oracle support
     20    object_id = models.CharField(_('object id'), maxlength=200, blank=True, null=True)
    2021    object_repr = models.CharField(_('object repr'), maxlength=200)
    2122    action_flag = models.PositiveSmallIntegerField(_('action flag'))
    2223    change_message = models.TextField(_('change message'), blank=True)
Back to Top