Merge lp:~djfroofy/storm/oracle-support-patches into lp:~kov-alfaiati/storm/oracle-support

[Drew Smathers]

[Drew Smathers (djfroofy)]

This branch contains patches for the following bug reports:

#377312 play nicely with statement caching by using consistent Aliases in query compilation
#371859 allow dsn to be set in uri options
#309382 add Sequence compilation
#307516 NameError ("variable" should be "param")

Unmerged revisions

278. By Drew Smathers <drew@kieru> on 2009-05-16

play nicely with statement caching by using consistent Aliases in query compilation [f=377312]

277. By Drew Smathers <drew@kieru> on 2009-05-16

allow dsn to be set in uri options [f=371859]

276. By Drew Smathers <drew@kieru> on 2009-05-16

add Sequence compilation to oracle-support [f=309382]

275. By Drew Smathers <drew@kieru> on 2009-05-16

NameError (param') [f=307516]

=== modified file 'storm/databases/oracle.py'
--- storm/databases/oracle.py	2008-11-12 21:03:56 +0000
+++ storm/databases/oracle.py	2009-05-16 17:20:10 +0000
@@ -55,6 +55,12 @@
 install_exceptions(oracle)
 compile = compile.create_child()
 
+def alias_names():
+    ct = 0
+    while 1:
+        yield '_%x' % ct
+        ct += 1
+
 @compile.when(type)
 def compile_type(compile, expr, state):
     cls_info = get_cls_info(expr)
@@ -100,6 +106,9 @@
 
 @compile.when(SetExpr)
 def compile_set_expr_oracle(compile, expr, state):
+
+    names = alias_names()
+
     if isinstance(expr, Minus):
         # Build new set expression without arguments (order_by, etc).
         new_expr = expr.__class__()
@@ -124,7 +133,7 @@
                     for i, column in enumerate(columns):
                         if column not in aliases:
                             if isinstance(column, Column):
-                                aliases[column] = columns[i] = Alias(column)
+                                aliases[column] = columns[i] = Alias(column, name=names.next())
                             elif isinstance(column, Alias):
                                 aliases[column.expr] = column
                     subexpr.columns = columns
@@ -143,12 +152,14 @@
             order_by_stmt = Undef
 
         # Build wrapping select statement.
-        select = Select(SQLRaw("*"), tables=Alias(set_stmt), limit=expr.limit,
+        select = Select(SQLRaw("*"), tables=Alias(set_stmt, name=names.next()), limit=expr.limit,
                         offset=expr.offset, order_by=order_by_stmt)
 
         return compile_select(compile, select, state)
     return compile_set_expr(compile, expr, state)
 
+
+
 @compile.when(Select)
 def compile_select_oracle(compile, select, state):
     limit = select.limit
@@ -156,6 +167,8 @@
     # make sure limit is Undef'ed
     select.offset = select.limit = Undef
 
+    names = alias_names()
+
     if select.default_tables is Undef:
         select.default_tables = ['DUAL']
 
@@ -170,16 +183,16 @@
         for i, column in enumerate(columns):
             if column not in aliases:
                 if isinstance(column, Column):
-                    aliases[column] = columns[i] = Alias(column)
+                    aliases[column] = columns[i] = Alias(column, name=names.next())
                 elif isinstance(column, Alias):
                     aliases[column.expr] = column
         select.columns = columns
         # /copied from expr.py's compile_set_expr
         stmt = SQLRaw("(%s)" % compile_select(compile, select, state))
-        select = Select(SQLRaw('*'), tables=Alias(stmt))
+        select = Select(SQLRaw('*'), tables=Alias(stmt, name=names.next()))
 
     if (limit is not Undef) and (offset is not Undef):
-        rownum_alias = Alias(SQLRaw('ROWNUM'))
+        rownum_alias = Alias(SQLRaw('ROWNUM'), name=names.next())
 
         # if we have an SQLRaw here that is because we are dealing
         # with a subquery
@@ -195,7 +208,7 @@
             select.where = And(select.where, where_expr)
 
         stmt = SQLRaw("(%s)" % compile_select(compile, select, state))
-        select = Select(SQLRaw('*'), tables=Alias(stmt), where = Gt(rownum_alias, offset))
+        select = Select(SQLRaw('*'), tables=Alias(stmt, names.next()), where = Gt(rownum_alias, offset))
     elif limit is not Undef:
         expr = Le(SQLRaw('ROWNUM'), limit)
         if select.where is Undef:
@@ -203,7 +216,7 @@
         else:
             select.where = And(select.where, expr)
     elif offset is not Undef:
-        rownum_alias = Alias(SQLRaw('ROWNUM'))
+        rownum_alias = Alias(SQLRaw('ROWNUM'), name=names.next())
 
         # if we have an SQLRaw here that is because we are dealing
         # with a subquery
@@ -213,7 +226,7 @@
             select.columns.append(rownum_alias)
 
         stmt = SQLRaw("(%s)" % compile_select(compile, select, state))
-        select = Select(SQLRaw('*'), tables=Alias(stmt), where = Gt(rownum_alias, offset))
+        select = Select(SQLRaw('*'), tables=Alias(stmt, name=names.next()), where = Gt(rownum_alias, offset))
 
     return compile_select(compile, select, state)
 
@@ -225,6 +238,10 @@
                                         SQLRaw("DEFAULT")))
     return compile_insert(compile, insert, state)
 
[e-mail](Sequence)
+def compile_sequence_oracle(compile, sequence, state):
+    return "%s.nextval" % sequence.name
+
 class currval(FuncExpr):
 
     name = "currval"
@@ -400,7 +417,7 @@
 
             if isinstance(value, unicode):
                 value = value.encode("UTF-8")
-            elif isinstance(value, str) and isinstance(variable, PickleVariable):
+            elif isinstance(value, str) and isinstance(param, PickleVariable):
                 value = base64.encodestring(value)
 
             new_params.append(value)
@@ -431,7 +448,18 @@
                 (isolation,))
 
 
-        self._dsn = oracle.makedsn(uri.host, uri.port, uri.database)
+        # Optionally set ORACLE_HOME and TNS_ADMIN environment
+        # variables for controlling tnsnames.ora lookup
+        oracle_home = uri.options.get('oracle_home')
+        if oracle_home:
+            os.environ['ORACLE_HOME'] = oracle_home
+        tns_admin = uri.options.get('tns_admin')
+        if tns_admin:
+            os.environ['TNS_ADMIN'] = tns_admin
+
+        self._dsn = uri.options.get('dsn')
+        if not self._dsn:
+            self._dsn = oracle.makedsn(uri.host, uri.port, uri.database)
         self._username = uri.username
         self._password = uri.password