Author: ikelly
Date: 2008-10-13 14:41:48 -0500 (Mon, 13 Oct 2008)
New Revision: 9232
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/django/db/backends/oracle/introspection.py
Log:
[1.0.X] Fixed Oracle introspection mapping of DATE columns, and added an
entry for Oracle 10g native float columns.
Backport of r9231 from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9228
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9228,9231
Modified:
django/branches/releases/1.0.X/django/db/backends/oracle/introspection.py
===================================================================
--- django/branches/releases/1.0.X/django/db/backends/oracle/introspection.py
2008-10-13 19:38:18 UTC (rev 9231)
+++ django/branches/releases/1.0.X/django/db/backends/oracle/introspection.py
2008-10-13 19:41:48 UTC (rev 9232)
@@ -8,7 +8,7 @@
# Maps type objects to Django Field types.
data_types_reverse = {
cx_Oracle.CLOB: 'TextField',
- cx_Oracle.DATETIME: 'DateTimeField',
+ cx_Oracle.DATETIME: 'DateField',
cx_Oracle.FIXED_CHAR: 'CharField',
cx_Oracle.NCLOB: 'TextField',
cx_Oracle.NUMBER: 'DecimalField',
@@ -16,6 +16,11 @@
cx_Oracle.TIMESTAMP: 'DateTimeField',
}
+ try:
+ data_types_reverse[cx_Oracle.NATIVE_FLOAT] = 'FloatField'
+ except AttributeError:
+ pass
+
def get_table_list(self, cursor):
"Returns a list of table names in the current database."
cursor.execute("SELECT TABLE_NAME FROM USER_TABLES")
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
