From cd1ae96e6ba19b3c135fd9894ab4fbec97567576 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 23 Oct 2005 17:57:28 +0000 Subject: [PATCH] --- examples/adjacencytree/tables.py | 8 ++++---- lib/sqlalchemy/databases/oracle.py | 3 +++ lib/sqlalchemy/engine.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/adjacencytree/tables.py b/examples/adjacencytree/tables.py index 3efa2f6fc2..ac8be6e586 100644 --- 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 478cff849f..9b8d103edc 100644 --- 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 dd27558974..93569a05c4 100644 --- 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): -- 2.47.2