Ticket #1990: django_oracle_release-0.95-v2.2.patch

File django_oracle_release-0.95-v2.2.patch, 20.5 KB (added by tzellman at gmail dot com, 18 years ago)

Found one more instance of the full_query "problem". Attached is the updated patch.

  • 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):
    … …  
    476482    def get_db_prep_save(self, value):
    477483        # Casts dates into string format for entry into database.
    478484        if value is not None:
    479             # MySQL will throw a warning if microseconds are given, because it
     485            # MySQL/Oracle will throw a warning if microseconds are given, because it
    480486            # doesn't support microseconds.
    481             if settings.DATABASE_ENGINE == 'mysql' and hasattr(value, 'microsecond'):
     487            if (settings.DATABASE_ENGINE == 'mysql' or settings.DATABASE_ENGINE=='oracle') and hasattr(value, 'microsecond'):
    482488                value = value.replace(microsecond=0)
    483489            value = str(value)
    484490        return Field.get_db_prep_save(self, value)
    485491
    486492    def get_db_prep_lookup(self, lookup_type, value):
     493        # Oracle will throw an error if microseconds are given, because it
     494        # doesn't support microseconds.
     495        if (settings.DATABASE_ENGINE=='oracle') and hasattr(value, 'microsecond'):
     496            value = value.replace(microsecond=0)
    487497        if lookup_type == 'range':
    488498            value = [str(v) for v in value]
    489499        else:
    … …  
    511521    def flatten_data(self,follow, obj = None):
    512522        val = self._get_val_from_obj(obj)
    513523        date_field, time_field = self.get_manipulator_field_names('')
    514         return {date_field: (val is not None and val.strftime("%Y-%m-%d") or ''),
    515                 time_field: (val is not None and val.strftime("%H:%M:%S") or '')}
     524        #cx_Oracle does not support strftime
     525        if (settings.DATABASE_ENGINE=='oracle'):
     526            return {date_field: (val is not None or ''),
     527                    time_field: (val is not None or '')}
     528        else:
     529            return {date_field: (val is not None and val.strftime("%Y-%m-%d") or ''),
     530                    time_field: (val is not None and val.strftime("%H:%M:%S") or '')}
    516531
    517532class EmailField(CharField):
    518533    def __init__(self, *args, **kwargs):
    … …  
    744759            # doesn't support microseconds.
    745760            if settings.DATABASE_ENGINE == 'mysql':
    746761                value = value.replace(microsecond=0)
    747             value = str(value)
     762                value = str(value)
     763            elif settings.DATABASE_ENGINE == 'oracle':
     764                value = value.replace(microsecond=0)
     765                # cx_Oracle expects a datetime.datetime to persist into TIMESTAMP field.
     766                value = datetime.datetime(1900, 1, 1, value.hour, value.minute, value.second)
     767            else:
     768                value = str(value)
    748769        return Field.get_db_prep_save(self, value)
    749770
    750771    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       
     173        full_query = None
     174        if (settings.DATABASE_ENGINE == 'oracle'):
     175            select, sql, params, full_query = self._get_sql_clause()
     176        else:
     177            select, sql, params = self._get_sql_clause()
     178
     179        if not full_query:
     180            cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
     181        else:
     182            cursor.execute(full_query, params)
    173183        fill_cache = self._select_related
    174184        index_end = len(self.model._meta.fields)
    175185        while 1:
    … …  
    192202        counter._offset = None
    193203        counter._limit = None
    194204        counter._select_related = False
    195         select, sql, params = counter._get_sql_clause()
     205        if (settings.DATABASE_ENGINE == 'oracle'):
     206            select, sql, params, full_query = counter._get_sql_clause()
     207        else:
     208            select, sql, params = counter._get_sql_clause()
    196209        cursor = connection.cursor()
    197210        if self._distinct:
    198211            id_col = "%s.%s" % (backend.quote_name(self.model._meta.db_table),
    … …  
    501514            sql.append("ORDER BY " + ", ".join(order_by))
    502515
    503516        # LIMIT and OFFSET clauses
    504         if self._limit is not None:
    505             sql.append("%s " % backend.get_limit_offset_sql(self._limit, self._offset))
     517        if (settings.DATABASE_ENGINE != 'oracle'):             
     518            if self._limit is not None:
     519                sql.append("%s " % backend.get_limit_offset_sql(self._limit, self._offset))
     520            else:
     521                assert self._offset is None, "'offset' is not allowed without 'limit'"
     522
     523            return select, " ".join(sql), params
    506524        else:
    507             assert self._offset is None, "'offset' is not allowed without 'limit'"
     525            # To support limits and offsets, Oracle requires some funky rewriting of an otherwise normal looking query.
     526            select_clause = ",".join(select)
     527            distinct = (self._distinct and "DISTINCT " or "")
    508528
    509         return select, " ".join(sql), params
     529            if order_by: 
     530                order_by_clause = " OVER (ORDER BY %s )" % (", ".join(order_by))
     531            else:
     532                #Oracle's row_number() function always requires an order-by clause.
     533                #So we need to define a default order-by, since none was provided.
     534                order_by_clause = " OVER (ORDER BY %s.%s)" % \
     535                    (backend.quote_name(opts.db_table), 
     536                    backend.quote_name(opts.fields[0].db_column or opts.fields[0].column))
     537            # limit_and_offset_clause
     538            offset = self._offset and int(self._offset) or 0
     539            limit = self._limit and int(self._limit) or None
     540            limit_and_offset_clause = ''
     541            if limit:
     542                limit_and_offset_clause = "WHERE rn > %s AND rn <= %s" % (offset, limit+offset)
     543            elif offset:
     544                limit_and_offset_clause = "WHERE rn > %s" % (offset)
    510545
     546            if len(limit_and_offset_clause) > 0:
     547                full_query = """SELECT * FROM 
     548                    (SELECT %s   
     549                    %s,
     550                    ROW_NUMBER() %s AS rn
     551                    %s
     552                    )
     553                    %s
     554                    """ % (distinct, select_clause, order_by_clause, " ".join(sql), limit_and_offset_clause)
     555            else:
     556                full_query = None
     557             
     558            return select, " ".join(sql), params, full_query
    511559class ValuesQuerySet(QuerySet):
    512560    def iterator(self):
    513561        # select_related and select aren't supported in values().
    … …  
    523571            field_names = [f.attname for f in self.model._meta.fields]
    524572
    525573        cursor = connection.cursor()
    526         select, sql, params = self._get_sql_clause()
     574        if (settings.DATABASE_ENGINE == 'oracle'):
     575            select, sql, params, full_query = self._get_sql_clause()
     576        else:
     577            select, sql, params = self._get_sql_clause()
    527578        select = ['%s.%s' % (backend.quote_name(self.model._meta.db_table), backend.quote_name(c)) for c in columns]
    528579        cursor.execute("SELECT " + (self._distinct and "DISTINCT " or "") + ",".join(select) + sql, params)
    529580        while 1:
    … …  
    636687    if table_prefix.endswith('.'):
    637688        table_prefix = backend.quote_name(table_prefix[:-1])+'.'
    638689    field_name = backend.quote_name(field_name)
     690    #put some oracle exceptions here
     691    if lookup_type == "icontains" and settings.DATABASE_ENGINE == 'oracle':
     692        return 'lower(%s%s) %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
    639693    try:
    640694        return '%s%s %s' % (table_prefix, field_name, (backend.OPERATOR_MAPPING[lookup_type] % '%s'))
    641695    except KeyError:
    … …  
    667721    Helper function that recursively populates the select, tables and where (in
    668722    place) for select_related queries.
    669723    """
     724    from django.db.models.fields import AutoField
    670725    qn = backend.quote_name
    671726    for f in opts.fields:
    672727        if f.rel and not f.null:
    … …  
    680735            cache_tables_seen.append(db_table)
    681736            where.append('%s.%s = %s.%s' % \
    682737                (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])
     738            if settings.DATABASE_ENGINE == 'oracle':
     739                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)])
     740            else:
     741                select.extend(['%s.%s' % (backend.quote_name(db_table), backend.quote_name(f2.column)) for f2 in f.rel.to._meta.fields])
    684742            fill_table_cache(f.rel.to._meta, select, tables, where, db_table, cache_tables_seen)
    685743
    686744def 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        print query
     78        print params   
     79        return Database.Cursor.execute(self, query, params)
    7180
    7281    def executemany(self, query, params=None):
    7382        if params is None: params = []
    7483        query = self.convert_arguments(query, len(params[0]))
     84        # cx can not execute the query with the closing ';'
     85        if query.endswith(';') :
     86            query = query[0:len(query)-1]                                                   
    7587        return Database.Cursor.executemany(self, query, params)
    7688
    7789    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 models,get_creation_module, backend
    8788    data_types = get_creation_module().DATA_TYPES
    8889
    8990    if not data_types:
    … …  
    157158                field_output.append(style.SQL_KEYWORD('UNIQUE'))
    158159            if f.primary_key:
    159160                field_output.append(style.SQL_KEYWORD('PRIMARY KEY'))
     161            if (settings.DATABASE_ENGINE == 'oracle') and f.unique and f.primary_key:
     162                # Suppress UNIQUE/PRIMARY KEY for Oracle (ORA-02259)
     163                field_output.remove(style.SQL_KEYWORD('UNIQUE'))
    160164            if f.rel:
    161165                if f.rel.to in known_models:
    162166                    field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
    … …  
    181185        full_statement.append('    %s%s' % (line, i < len(table_output)-1 and ',' or ''))
    182186    full_statement.append(');')
    183187    final_output.append('\n'.join(full_statement))
     188   
     189    # To simulate auto-incrementing primary keys in Oracle -- creating primary tables
     190    if (settings.DATABASE_ENGINE == 'oracle') & (opts.has_auto_field):
     191        sequence_statement = 'CREATE SEQUENCE %s_sq;' % opts.db_table
     192        final_output.append(sequence_statement)
     193        trigger_statement = '' + \
     194            'CREATE OR REPLACE trigger %s_tr\n'    % opts.db_table + \
     195            '  before insert on %s\n'           % backend.quote_name(opts.db_table) + \
     196            '    for each row\n'  + \
     197            '      when (new.id is NULL)\n' + \
     198            '        begin\n' + \
     199            '         select %s_sq.NEXTVAL into :new.id from DUAL;\n' % opts.db_table + \
     200            '      end;\n'                                                                       
     201        final_output.append(trigger_statement)
    184202
     203
    185204    return final_output, pending_references
    186205
    187206def _get_sql_for_pending_references(model, pending_references):
    … …  
    208227                    r_name += '_%s' % reference_names[r_name]
    209228                else:
    210229                    reference_names[r_name] = 0
    211                 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,
    213                     backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col)))
     230                # if constraint name size is over 29 char and db is oracle, chop it
     231                if settings.DATABASE_ENGINE == 'oracle' and len(r_name) > 29:
     232                    final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s);' % \
     233                                        (backend.quote_name(r_table), r_name[0:29],
     234                                         backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col)))
     235                else:
     236                    final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s);' % \
     237                                        (backend.quote_name(r_table), r_name,
     238                                         backend.quote_name(r_col), backend.quote_name(table), backend.quote_name(col)))
    214239            del pending_references[model]
    215240    return final_output
    216241
    … …  
    248273                style.SQL_FIELD(backend.quote_name(f.m2m_reverse_name()))))
    249274            table_output.append(');')
    250275            final_output.append('\n'.join(table_output))
     276        # To simulate auto-incrementing primary keys in Oracle -- creating m2m tables
     277        if (settings.DATABASE_ENGINE == 'oracle'):
     278            m_table = f.m2m_db_table()
     279            sequence_statement = 'CREATE SEQUENCE %s_sq;' % m_table
     280            final_output.append(sequence_statement)
     281            trigger_statement = '' + \
     282            'CREATE OR REPLACE trigger %s_tr\n'    % m_table + \
     283            '  before insert on %s\n'           % backend.quote_name(m_table) + \
     284            '    for each row\n'  + \
     285            '      when (new.id is NULL)\n' + \
     286            '        begin\n' + \
     287            '         select %s_sq.NEXTVAL into :new.id from DUAL;\n' % m_table + \
     288            '      end;\n'
     289            final_output.append(trigger_statement)
    251290    return final_output
    252291
    253292def get_sql_delete(app):
    … …  
    471510            sql.extend(_get_sql_for_pending_references(model, pending_references))
    472511            print "Creating table %s" % model._meta.db_table
    473512            for statement in sql:
    474                 cursor.execute(statement)
     513                # go on if one table could not be created
     514                try:
     515                    cursor.execute(statement)
     516                except Exception, e:
     517                    print statement
     518                    print e
    475519            table_list.append(model._meta.db_table)
    476520
    477521        for model in model_list:
    … …  
    480524                if sql:
    481525                    print "Creating many-to-many tables for %s model" % model.__name__
    482526                    for statement in sql:
    483                         cursor.execute(statement)
     527                        try:
     528                            cursor.execute(statement)
     529                        except Exception, e:
     530                            print statement
     531                            print e
    484532
    485533        transaction.commit_unless_managed()
    486534
    … …  
    12811329        if not mod_list:
    12821330            parser.print_usage_and_exit()
    12831331        if action not in NO_SQL_TRANSACTION:
    1284             print style.SQL_KEYWORD("BEGIN;")
     1332            if settings.DATABASE_ENGINE != 'oracle':
     1333                print style.SQL_KEYWORD("BEGIN;")
    12851334        for mod in mod_list:
    12861335            output = action_mapping[action](mod)
    12871336            if output:
    12881337                print '\n'.join(output)
    12891338        if action not in NO_SQL_TRANSACTION:
    1290             print style.SQL_KEYWORD("COMMIT;")
     1339            if settings.DATABASE_ENGINE != 'oracle':
     1340                print style.SQL_KEYWORD("COMMIT;")
    12911341
    12921342def execute_manager(settings_mod, argv=None):
    12931343    # Add this project to sys.path so that it's importable in the conventional

  • contrib/sessions/models.py

     
    5151    session_key = models.CharField(_('session key'), maxlength=40, primary_key=True)
    5252    session_data = models.TextField(_('session data'))
    5353    expire_date = models.DateTimeField(_('expire date'))
     54
    5455    objects = SessionManager()
    5556    class Meta:
    5657        db_table = 'django_session'

  • 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