]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
pg and oracle fixes
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 30 Sep 2012 05:02:56 +0000 (01:02 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 30 Sep 2012 05:02:56 +0000 (01:02 -0400)
test/dialect/test_oracle.py
test/dialect/test_postgresql.py

index 373c358fffd268bed4b72d4621ff8abdb1915bf1..66b27a12ae03e8ca7b4b79f7d00156873e292320 100644 (file)
@@ -12,6 +12,7 @@ from sqlalchemy.dialects.oracle import cx_oracle, base as oracle
 from sqlalchemy.engine import default
 from sqlalchemy.util import jython
 from sqlalchemy.util.compat import decimal
+from sqlalchemy.testing.schema import Table, Column
 import datetime
 import os
 
index 6351ce9d05254c0a005b3c2dea65894a3c786428..3be005f36a855c753e9dc2e8de8b09929529efcd 100644 (file)
@@ -13,7 +13,7 @@ from sqlalchemy import Table, Column, select, MetaData, text, Integer, \
             PrimaryKeyConstraint, DateTime, tuple_, Float, BigInteger, \
             func, literal_column, literal, bindparam, cast, extract, \
             SmallInteger, Enum, REAL, update, insert, Index, delete, \
-            and_, Date, TypeDecorator, Time, Unicode, Interval
+            and_, Date, TypeDecorator, Time, Unicode, Interval, or_
 from sqlalchemy.orm import Session, mapper, aliased
 from sqlalchemy import exc, schema, types
 from sqlalchemy.dialects.postgresql import base as postgresql