(no commit message)

diff --git a/examples/adjacencytree/tables.py b/examples/adjacencytree/tables.py
index 3efa2f6fc2f89e93d57bbc8e1266369028983348..ac8be6e58639fe5fed93b6000e3017b7f4aa102c 100644 (file)
--- a/examples/adjacencytree/tables.py
+++ b/examples/adjacencytree/tables.py
@@ -3,8 +3,8 @@ import sqlalchemy.engine
 import os
 
 #engine = sqlalchemy.engine.create_engine('sqlite', ':memory:', {}, echo = True)
-engine = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=True)
-#engine = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=True)
+#engine = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=True)
+engine = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=True)
 
 
 """create the treenodes table.  This is ia basic adjacency list model table.
@@ -29,7 +29,7 @@ print "\n\n\n----------------------------"
 print "Creating Tree Table:"
 print "----------------------------"
 
-treedata.create()    
-trees.create()
+#treedata.create()    
+#trees.create()
 
 

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 478cff849fd56e7056f690a1055e05eb074e401f..9b8d103edc797ddd3164ba2d2f9271f0c3bd203d 100644 (file)
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -90,6 +90,9 @@ class OracleSQLEngine(ansisql.ANSISQLEngine):
     def last_inserted_ids(self):
         return self.context.last_inserted_ids
 
+    def rowid_column_name(self):
+        return "rowid"
+
     def compiler(self, statement, bindparams):
         return OracleCompiler(self, statement, bindparams)
 

diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index dd27558974421d2bec1794b9920be41521dd5fba..93569a05c476be5e81ebf65bb3d2244d3822c131 100644 (file)
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -242,12 +242,12 @@ class ResultProxy:
                     rec = (typemap.get(item[0], types.NULLTYPE), i)
                 else:
                     rec = (types.NULLTYPE, i)
-                self.props[item[0]] = rec
+                self.props[item[0].lower()] = rec
                 self.props[i] = rec
                 i+=1
 
     def _get_col(self, row, key):
-        rec = self.props[key]
+        rec = self.props[key.lower()]
         return rec[0].convert_result_value(row[rec[1]])
         
     def fetchall(self):