From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 23 Oct 2005 17:35:16 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: rel_0_1_0~455
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcc033fb271ef4af7988e6a0af728b5d0be45bc9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

---

diff --git a/examples/adjacencytree/tables.py b/examples/adjacencytree/tables.py
index 7dad950cc7..3efa2f6fc2 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.
@@ -12,7 +12,7 @@ One additional column, "root_node_id", references a "root node" row and is used
 in the 'byroot_tree' example."""
 
 trees = Table('treenodes', engine,
-    Column('node_id', Integer, Sequence('tree_id_seq', optional=True), primary_key=True),
+    Column('node_id', Integer, Sequence('treenode_id_seq',optional=False), primary_key=True),
     Column('parent_node_id', Integer, ForeignKey('treenodes.node_id'), nullable=True),
     Column('root_node_id', Integer, ForeignKey('treenodes.node_id'), nullable=True),
     Column('node_name', String(50), nullable=False),
@@ -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 8c71ef4ad2..04d0384b2f 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -112,7 +112,7 @@ class OracleSQLEngine(ansisql.ANSISQLEngine):
             for primary_key in compiled.statement.table.primary_keys:
                 if not parameters.has_key(primary_key.key) or parameters[primary_key.key] is None:
                     if primary_key.sequence is None:
-			raise "Oracle primary key columns require schema.Sequence to create ids"
+                        raise "Oracle primary key columns require schema.Sequence to create ids"
                     if echo is True or self.echo:
                         self.log("select %s.nextval from dual" % primary_key.sequence.name)
                     cursor.execute("select %s.nextval from dual" % primary_key.sequence.name)