summaryrefslogtreecommitdiff
path: root/test/sql
diff options
context:
space:
mode:
Diffstat (limited to 'test/sql')
-rw-r--r--test/sql/test_case_statement.py4
-rw-r--r--test/sql/test_columns.py4
-rw-r--r--test/sql/test_compiler.py4
-rw-r--r--test/sql/test_constraints.py10
-rw-r--r--test/sql/test_defaults.py8
-rw-r--r--test/sql/test_functions.py10
-rw-r--r--test/sql/test_generative.py4
-rw-r--r--test/sql/test_labels.py4
-rw-r--r--test/sql/test_query.py8
-rw-r--r--test/sql/test_quote.py2
-rw-r--r--test/sql/test_returning.py6
-rw-r--r--test/sql/test_rowcount.py2
-rw-r--r--test/sql/test_selectable.py4
-rw-r--r--test/sql/test_types.py12
-rw-r--r--test/sql/test_unicode.py4
15 files changed, 43 insertions, 43 deletions
diff --git a/test/sql/test_case_statement.py b/test/sql/test_case_statement.py
index 1a106ee5e..7bc3ab31f 100644
--- a/test/sql/test_case_statement.py
+++ b/test/sql/test_case_statement.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message, eq_
+from test.lib.testing import assert_raises, assert_raises_message, eq_
import sys
from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy import util, exc
from sqlalchemy.sql import table, column
diff --git a/test/sql/test_columns.py b/test/sql/test_columns.py
index 3cbb01943..95933b41b 100644
--- a/test/sql/test_columns.py
+++ b/test/sql/test_columns.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
from sqlalchemy import *
from sqlalchemy import exc, sql
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy import Table, Column # don't use testlib's wrappers
diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 338a5491e..788feb84d 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -1,4 +1,4 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
import datetime, re, operator
from sqlalchemy import *
from sqlalchemy import exc, sql, util
@@ -6,7 +6,7 @@ from sqlalchemy.sql import table, column, label, compiler
from sqlalchemy.sql.expression import ClauseList
from sqlalchemy.engine import default
from sqlalchemy.databases import *
-from sqlalchemy.test import *
+from test.lib import *
table1 = table('mytable',
column('myid', Integer),
diff --git a/test/sql/test_constraints.py b/test/sql/test_constraints.py
index 69f29a9bd..56c5c6205 100644
--- a/test/sql/test_constraints.py
+++ b/test/sql/test_constraints.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
from sqlalchemy import *
from sqlalchemy import exc, schema
-from sqlalchemy.test import *
-from sqlalchemy.test import config, engines
+from test.lib import *
+from test.lib import config, engines
from sqlalchemy.engine import ddl
-from sqlalchemy.test.testing import eq_
-from sqlalchemy.test.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
+from test.lib.testing import eq_
+from test.lib.assertsql import AllOf, RegexSQL, ExactSQL, CompiledSQL
from sqlalchemy.dialects.postgresql import base as postgresql
class ConstraintTest(TestBase, AssertsExecutionResults, AssertsCompiledSQL):
diff --git a/test/sql/test_defaults.py b/test/sql/test_defaults.py
index f49e4d0d3..7ec43f8d2 100644
--- a/test/sql/test_defaults.py
+++ b/test/sql/test_defaults.py
@@ -1,13 +1,13 @@
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
import datetime
from sqlalchemy import Sequence, Column, func
from sqlalchemy.schema import CreateSequence, DropSequence
from sqlalchemy.sql import select, text
import sqlalchemy as sa
-from sqlalchemy.test import testing, engines
+from test.lib import testing, engines
from sqlalchemy import MetaData, Integer, String, ForeignKey, Boolean, exc
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.testing import eq_
+from test.lib.schema import Table
+from test.lib.testing import eq_
from test.sql import _base
diff --git a/test/sql/test_functions.py b/test/sql/test_functions.py
index c9bb8348c..396eaaf9b 100644
--- a/test/sql/test_functions.py
+++ b/test/sql/test_functions.py
@@ -1,17 +1,17 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
import datetime
from sqlalchemy import *
from sqlalchemy.sql import table, column
from sqlalchemy import databases, sql, util
from sqlalchemy.sql.compiler import BIND_TEMPLATES
from sqlalchemy.engine import default
-from sqlalchemy.test.engines import all_dialects
+from test.lib.engines import all_dialects
from sqlalchemy import types as sqltypes
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy.sql.functions import GenericFunction
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
from decimal import Decimal as _python_Decimal
-from sqlalchemy.test import testing
+from test.lib import testing
from sqlalchemy.databases import *
diff --git a/test/sql/test_generative.py b/test/sql/test_generative.py
index 5457c7a79..5454a0f09 100644
--- a/test/sql/test_generative.py
+++ b/test/sql/test_generative.py
@@ -1,11 +1,11 @@
from sqlalchemy import *
from sqlalchemy.sql import table, column, ClauseElement
from sqlalchemy.sql.expression import _clone, _from_objects
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy.sql.visitors import *
from sqlalchemy import util
from sqlalchemy.sql import util as sql_util
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
class TraversalTest(TestBase, AssertsExecutionResults):
"""test ClauseVisitor's traversal, particularly its ability to copy and modify
diff --git a/test/sql/test_labels.py b/test/sql/test_labels.py
index f67ba9855..0f84c30a0 100644
--- a/test/sql/test_labels.py
+++ b/test/sql/test_labels.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import assert_raises, assert_raises_message
+from test.lib.testing import assert_raises, assert_raises_message
from sqlalchemy import *
from sqlalchemy import exc as exceptions
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy.engine import default
IDENT_LENGTH = 29
diff --git a/test/sql/test_query.py b/test/sql/test_query.py
index 410ff73a6..f59b34076 100644
--- a/test/sql/test_query.py
+++ b/test/sql/test_query.py
@@ -1,11 +1,11 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
import datetime
from sqlalchemy import *
from sqlalchemy import exc, sql, util
from sqlalchemy.engine import default, base
-from sqlalchemy.test import *
-from sqlalchemy.test.testing import eq_, assert_raises_message, assert_raises
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.testing import eq_, assert_raises_message, assert_raises
+from test.lib.schema import Table, Column
class QueryTest(TestBase):
diff --git a/test/sql/test_quote.py b/test/sql/test_quote.py
index 81a68ec74..8f27a7b3c 100644
--- a/test/sql/test_quote.py
+++ b/test/sql/test_quote.py
@@ -1,7 +1,7 @@
from sqlalchemy import *
from sqlalchemy import sql, schema
from sqlalchemy.sql import compiler
-from sqlalchemy.test import *
+from test.lib import *
class QuoteTest(TestBase, AssertsCompiledSQL):
@classmethod
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index 332f4eef5..632a739f1 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -1,7 +1,7 @@
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.schema import Table, Column
+from test.lib import *
+from test.lib.schema import Table, Column
from sqlalchemy.types import TypeDecorator
class ReturningTest(TestBase, AssertsExecutionResults):
diff --git a/test/sql/test_rowcount.py b/test/sql/test_rowcount.py
index ccd0d8f5e..ed40f2801 100644
--- a/test/sql/test_rowcount.py
+++ b/test/sql/test_rowcount.py
@@ -1,5 +1,5 @@
from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
class FoundRowsTest(TestBase, AssertsExecutionResults):
diff --git a/test/sql/test_selectable.py b/test/sql/test_selectable.py
index 5bebbe05f..77acf896b 100644
--- a/test/sql/test_selectable.py
+++ b/test/sql/test_selectable.py
@@ -1,9 +1,9 @@
"""Test various algorithmic properties of selectables."""
-from sqlalchemy.test.testing import eq_, assert_raises, \
+from test.lib.testing import eq_, assert_raises, \
assert_raises_message
from sqlalchemy import *
-from sqlalchemy.test import *
+from test.lib import *
from sqlalchemy.sql import util as sql_util, visitors
from sqlalchemy import exc
from sqlalchemy.sql import table, column, null
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 993843891..bfadca7c9 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1,18 +1,18 @@
# coding: utf-8
-from sqlalchemy.test.testing import eq_, assert_raises, assert_raises_message
+from test.lib.testing import eq_, assert_raises, assert_raises_message
import decimal
import datetime, os, re
from sqlalchemy import *
from sqlalchemy import exc, types, util, schema
from sqlalchemy.sql import operators, column, table
-from sqlalchemy.test.testing import eq_
+from test.lib.testing import eq_
import sqlalchemy.engine.url as url
from sqlalchemy.databases import *
-from sqlalchemy.test.schema import Table, Column
-from sqlalchemy.test import *
-from sqlalchemy.test.util import picklers
+from test.lib.schema import Table, Column
+from test.lib import *
+from test.lib.util import picklers
from decimal import Decimal
-from sqlalchemy.test.util import round_decimal
+from test.lib.util import round_decimal
class AdaptTest(TestBase):
diff --git a/test/sql/test_unicode.py b/test/sql/test_unicode.py
index a116d34cb..2eda4ffa8 100644
--- a/test/sql/test_unicode.py
+++ b/test/sql/test_unicode.py
@@ -2,8 +2,8 @@
"""verrrrry basic unicode column name testing"""
from sqlalchemy import *
-from sqlalchemy.test import *
-from sqlalchemy.test.engines import utf8_engine
+from test.lib import *
+from test.lib.engines import utf8_engine
from sqlalchemy.sql import column
class UnicodeSchemaTest(TestBase):
View Lorry Controller Status