From: Diana Clarke <diana.joan.clarke@gmail.com>
Date: Fri, 29 Mar 2013 23:10:01 +0000 (-0400)
Subject: move the insert tests from CRUDTest into sql/test_insert.py (see #2630)
X-Git-Tag: rel_0_8_1~25^2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17487a0db7759b0414e73fc3b9e61672e1da7658;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

move the insert tests from CRUDTest into sql/test_insert.py (see #2630)
---

diff --git a/test/sql/test_compiler.py b/test/sql/test_compiler.py
index 3e2c206e73..c12962f7c6 100644
--- a/test/sql/test_compiler.py
+++ b/test/sql/test_compiler.py
@@ -15,7 +15,7 @@ from sqlalchemy import testing
 from sqlalchemy.testing import fixtures, AssertsCompiledSQL
 from sqlalchemy import Integer, String, MetaData, Table, Column, select, \
     func, not_, cast, text, tuple_, exists, update, bindparam,\
-    insert, literal, and_, null, type_coerce, alias, or_, literal_column,\
+    literal, and_, null, type_coerce, alias, or_, literal_column,\
     Float, TIMESTAMP, Numeric, Date, Text, collate, union, except_,\
     intersect, union_all, Boolean, distinct, join, outerjoin, asc, desc,\
     over, subquery, case
@@ -2460,224 +2460,6 @@ class KwargPropagationTest(fixtures.TestBase):
 class CRUDTest(fixtures.TestBase, AssertsCompiledSQL):
     __dialect__ = 'default'
 
-    def test_insert(self):
-        # generic insert, will create bind params for all columns
-        self.assert_compile(insert(table1),
-                            "INSERT INTO mytable (myid, name, description) "
-                            "VALUES (:myid, :name, :description)")
-
-        # insert with user-supplied bind params for specific columns,
-        # cols provided literally
-        self.assert_compile(
-            insert(table1, {
-                            table1.c.myid: bindparam('userid'),
-                            table1.c.name: bindparam('username')}),
-            "INSERT INTO mytable (myid, name) VALUES (:userid, :username)")
-
-        # insert with user-supplied bind params for specific columns, cols
-        # provided as strings
-        self.assert_compile(
-            insert(table1, dict(myid=3, name='jack')),
-            "INSERT INTO mytable (myid, name) VALUES (:myid, :name)"
-        )
-
-        # test with a tuple of params instead of named
-        self.assert_compile(
-            insert(table1, (3, 'jack', 'mydescription')),
-            "INSERT INTO mytable (myid, name, description) VALUES "
-            "(:myid, :name, :description)",
-            checkparams={
-                'myid': 3, 'name': 'jack', 'description': 'mydescription'}
-        )
-
-        self.assert_compile(
-            insert(table1, values={
-                                    table1.c.myid: bindparam('userid')
-                                }).values(
-                                    {table1.c.name: bindparam('username')}),
-            "INSERT INTO mytable (myid, name) VALUES (:userid, :username)"
-        )
-
-        self.assert_compile(
-                    insert(table1, values=dict(myid=func.lala())),
-                    "INSERT INTO mytable (myid) VALUES (lala())")
-
-    def test_insert_prefix(self):
-        stmt = table1.insert().prefix_with("A", "B", dialect="mysql").\
-                prefix_with("C", "D")
-        self.assert_compile(stmt,
-            "INSERT A B C D INTO mytable (myid, name, description) "
-            "VALUES (%s, %s, %s)", dialect=mysql.dialect()
-        )
-        self.assert_compile(stmt,
-            "INSERT C D INTO mytable (myid, name, description) "
-            "VALUES (:myid, :name, :description)")
-
-    def test_inline_default_insert(self):
-        metadata = MetaData()
-        table = Table('sometable', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('foo', Integer, default=func.foobar()))
-        self.assert_compile(
-                    table.insert(values={}, inline=True),
-                    "INSERT INTO sometable (foo) VALUES (foobar())")
-        self.assert_compile(
-                    table.insert(inline=True),
-                    "INSERT INTO sometable (foo) VALUES (foobar())", params={})
-
-    def test_insert_returning_not_in_default(self):
-        stmt = table1.insert().returning(table1.c.myid)
-        assert_raises_message(
-            exc.CompileError,
-            "RETURNING is not supported by this dialect's statement compiler.",
-            stmt.compile
-        )
-
-    def test_empty_insert_default(self):
-        stmt = table1.insert().values({})  # hide from 2to3
-        self.assert_compile(stmt, "INSERT INTO mytable () VALUES ()")
-
-    def test_empty_insert_default_values(self):
-        stmt = table1.insert().values({})  # hide from 2to3
-        dialect = default.DefaultDialect()
-        dialect.supports_empty_insert = dialect.supports_default_values = True
-        self.assert_compile(stmt, "INSERT INTO mytable DEFAULT VALUES",
-                        dialect=dialect)
-
-    def test_empty_insert_not_supported(self):
-        stmt = table1.insert().values({})  # hide from 2to3
-        dialect = default.DefaultDialect()
-        dialect.supports_empty_insert = dialect.supports_default_values = False
-        assert_raises_message(
-            exc.CompileError,
-            "The 'default' dialect with current database version "
-                "settings does not support empty inserts.",
-            stmt.compile, dialect=dialect
-        )
-
-    def test_multivalues_insert_not_supported(self):
-        stmt = table1.insert().values([{"myid": 1}, {"myid": 2}])
-        dialect = default.DefaultDialect()
-        assert_raises_message(
-            exc.CompileError,
-            "The 'default' dialect with current database version settings "
-                "does not support in-place multirow inserts.",
-            stmt.compile, dialect=dialect
-        )
-
-    def test_multivalues_insert_named(self):
-        stmt = table1.insert().\
-                    values([{"myid": 1, "name": 'a', "description": 'b'},
-                            {"myid": 2, "name": 'c', "description": 'd'},
-                            {"myid": 3, "name": 'e', "description": 'f'}
-                        ])
-
-        result = "INSERT INTO mytable (myid, name, description) VALUES " \
-                 "(:myid_0, :name_0, :description_0), " \
-                 "(:myid_1, :name_1, :description_1), " \
-                 "(:myid_2, :name_2, :description_2)"
-
-        dialect = default.DefaultDialect()
-        dialect.supports_multivalues_insert = True
-        self.assert_compile(stmt, result,
-                checkparams={
-                    'description_2': 'f', 'name_2': 'e',
-                    'name_0': 'a', 'name_1': 'c', 'myid_2': 3,
-                    'description_0': 'b', 'myid_0': 1,
-                    'myid_1': 2, 'description_1': 'd'
-                },
-                dialect=dialect)
-
-    def test_multivalues_insert_positional(self):
-        stmt = table1.insert().\
-                    values([{"myid": 1, "name": 'a', "description": 'b'},
-                            {"myid": 2, "name": 'c', "description": 'd'},
-                            {"myid": 3, "name": 'e', "description": 'f'}
-                        ])
-
-        result = "INSERT INTO mytable (myid, name, description) VALUES " \
-                 "(%s, %s, %s), " \
-                 "(%s, %s, %s), " \
-                 "(%s, %s, %s)" \
-
-        dialect = default.DefaultDialect()
-        dialect.supports_multivalues_insert = True
-        dialect.paramstyle = "format"
-        dialect.positional = True
-        self.assert_compile(stmt, result,
-                checkpositional=(1, 'a', 'b', 2, 'c', 'd', 3, 'e', 'f'),
-                dialect=dialect)
-
-    def test_multirow_inline_default_insert(self):
-        metadata = MetaData()
-        table = Table('sometable', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('data', String),
-            Column('foo', Integer, default=func.foobar()))
-
-        stmt = table.insert().\
-                    values([
-                            {"id": 1, "data": "data1"},
-                            {"id": 2, "data": "data2", "foo": "plainfoo"},
-                            {"id": 3, "data": "data3"},
-                        ])
-        result = "INSERT INTO sometable (id, data, foo) VALUES "\
-                    "(%(id_0)s, %(data_0)s, foobar()), "\
-                    "(%(id_1)s, %(data_1)s, %(foo_1)s), "\
-                    "(%(id_2)s, %(data_2)s, foobar())"
-
-        self.assert_compile(stmt, result,
-                checkparams={'data_2': 'data3', 'id_0': 1, 'id_2': 3,
-                                'foo_1': 'plainfoo', 'data_1': 'data2',
-                                'id_1': 2, 'data_0': 'data1'},
-                dialect=postgresql.dialect())
-
-    def test_multirow_server_default_insert(self):
-        metadata = MetaData()
-        table = Table('sometable', metadata,
-            Column('id', Integer, primary_key=True),
-            Column('data', String),
-            Column('foo', Integer, server_default=func.foobar()))
-
-        stmt = table.insert().\
-                    values([
-                            {"id": 1, "data": "data1"},
-                            {"id": 2, "data": "data2", "foo": "plainfoo"},
-                            {"id": 3, "data": "data3"},
-                        ])
-        result = "INSERT INTO sometable (id, data) VALUES "\
-                    "(%(id_0)s, %(data_0)s), "\
-                    "(%(id_1)s, %(data_1)s), "\
-                    "(%(id_2)s, %(data_2)s)"
-
-        self.assert_compile(stmt, result,
-                checkparams={'data_2': 'data3', 'id_0': 1, 'id_2': 3,
-                                'data_1': 'data2',
-                                'id_1': 2, 'data_0': 'data1'},
-                dialect=postgresql.dialect())
-
-        stmt = table.insert().\
-                    values([
-                            {"id": 1, "data": "data1", "foo": "plainfoo"},
-                            {"id": 2, "data": "data2"},
-                            {"id": 3, "data": "data3", "foo": "otherfoo"},
-                        ])
-
-        # note the effect here is that the first set of params
-        # takes effect for the rest of them, when one is absent
-        result = "INSERT INTO sometable (id, data, foo) VALUES "\
-                    "(%(id_0)s, %(data_0)s, %(foo_0)s), "\
-                    "(%(id_1)s, %(data_1)s, %(foo_0)s), "\
-                    "(%(id_2)s, %(data_2)s, %(foo_2)s)"
-
-        self.assert_compile(stmt, result,
-                checkparams={'data_2': 'data3', 'id_0': 1, 'id_2': 3,
-                                'data_1': 'data2',
-                                "foo_0": "plainfoo",
-                                "foo_2": "otherfoo",
-                                'id_1': 2, 'data_0': 'data1'},
-                dialect=postgresql.dialect())
-
     def test_update(self):
         self.assert_compile(
                 update(table1, table1.c.myid == 7),
diff --git a/test/sql/test_insert.py b/test/sql/test_insert.py
new file mode 100644
index 0000000000..48fa758737
--- /dev/null
+++ b/test/sql/test_insert.py
@@ -0,0 +1,309 @@
+#! coding:utf-8
+
+from sqlalchemy import Column, Integer, MetaData, String, Table,\
+    bindparam, exc, func, insert
+from sqlalchemy.dialects import mysql, postgresql
+from sqlalchemy.engine import default
+from sqlalchemy.testing import AssertsCompiledSQL,\
+    assert_raises_message, fixtures
+
+
+class _InsertTestBase(object):
+    @classmethod
+    def define_tables(cls, metadata):
+        Table('mytable', metadata,
+              Column('myid', Integer),
+              Column('name', String),
+              Column('description', String))
+        Table('myothertable', metadata,
+              Column('otherid', Integer),
+              Column('othername', String))
+
+
+class InsertTest(_InsertTestBase, fixtures.TablesTest, AssertsCompiledSQL):
+    __dialect__ = 'default'
+
+    def test_generic_insert_bind_params_all_columns(self):
+        table1 = self.tables.mytable
+
+        self.assert_compile(insert(table1),
+            'INSERT INTO mytable (myid, name, description) '
+            'VALUES (:myid, :name, :description)')
+
+    def test_insert_with_values_dict(self):
+        table1 = self.tables.mytable
+
+        checkparams = {
+            'myid': 3,
+            'name': 'jack'
+        }
+
+        self.assert_compile(insert(table1, dict(myid=3, name='jack')),
+            'INSERT INTO mytable (myid, name) VALUES (:myid, :name)',
+            checkparams=checkparams)
+
+    def test_insert_with_values_tuple(self):
+        table1 = self.tables.mytable
+
+        checkparams = {
+            'myid': 3,
+            'name': 'jack',
+            'description': 'mydescription'
+        }
+
+        self.assert_compile(insert(table1, (3, 'jack', 'mydescription')),
+            'INSERT INTO mytable (myid, name, description) '
+            'VALUES (:myid, :name, :description)',
+            checkparams=checkparams)
+
+    def test_insert_with_values_func(self):
+        table1 = self.tables.mytable
+
+        self.assert_compile(insert(table1, values=dict(myid=func.lala())),
+            'INSERT INTO mytable (myid) VALUES (lala())')
+
+    def test_insert_with_user_supplied_bind_params(self):
+        table1 = self.tables.mytable
+
+        values = {
+            table1.c.myid: bindparam('userid'),
+            table1.c.name: bindparam('username')
+        }
+
+        self.assert_compile(insert(table1, values),
+            'INSERT INTO mytable (myid, name) VALUES (:userid, :username)')
+
+    def test_insert_values(self):
+        table1 = self.tables.mytable
+
+        values1 = {table1.c.myid: bindparam('userid')}
+        values2 = {table1.c.name: bindparam('username')}
+
+        self.assert_compile(insert(table1, values=values1).values(values2),
+            'INSERT INTO mytable (myid, name) VALUES (:userid, :username)')
+
+    def test_prefix_with(self):
+        table1 = self.tables.mytable
+
+        stmt = table1.insert().\
+            prefix_with('A', 'B', dialect='mysql').\
+            prefix_with('C', 'D')
+
+        self.assert_compile(stmt,
+            'INSERT C D INTO mytable (myid, name, description) '
+            'VALUES (:myid, :name, :description)')
+
+        self.assert_compile(stmt,
+            'INSERT A B C D INTO mytable (myid, name, description) '
+            'VALUES (%s, %s, %s)', dialect=mysql.dialect())
+
+    def test_inline_default(self):
+        metadata = MetaData()
+        table = Table('sometable', metadata,
+            Column('id', Integer, primary_key=True),
+            Column('foo', Integer, default=func.foobar()))
+
+        self.assert_compile(table.insert(values={}, inline=True),
+            'INSERT INTO sometable (foo) VALUES (foobar())')
+
+        self.assert_compile(table.insert(inline=True),
+            'INSERT INTO sometable (foo) VALUES (foobar())', params={})
+
+    def test_returning_not_in_default(self):
+        table1 = self.tables.mytable
+
+        stmt = table1.insert().returning(table1.c.myid)
+        m = "RETURNING is not supported by this dialect's statement compiler."
+        assert_raises_message(exc.CompileError, m, stmt.compile)
+
+
+class EmptyTest(_InsertTestBase, fixtures.TablesTest, AssertsCompiledSQL):
+    __dialect__ = 'default'
+
+    def test_empty_insert_default(self):
+        table1 = self.tables.mytable
+
+        stmt = table1.insert().values({})  # hide from 2to3
+        self.assert_compile(stmt, 'INSERT INTO mytable () VALUES ()')
+
+    def test_supports_empty_insert_true(self):
+        table1 = self.tables.mytable
+
+        dialect = default.DefaultDialect()
+        dialect.supports_empty_insert = dialect.supports_default_values = True
+
+        stmt = table1.insert().values({})  # hide from 2to3
+        self.assert_compile(stmt,
+            'INSERT INTO mytable DEFAULT VALUES',
+            dialect=dialect)
+
+    def test_supports_empty_insert_false(self):
+        table1 = self.tables.mytable
+
+        dialect = default.DefaultDialect()
+        dialect.supports_empty_insert = dialect.supports_default_values = False
+
+        stmt = table1.insert().values({})  # hide from 2to3
+        assert_raises_message(exc.CompileError,
+            "The 'default' dialect with current database version "
+                "settings does not support empty inserts.",
+            stmt.compile, dialect=dialect)
+
+
+class MultirowTest(_InsertTestBase, fixtures.TablesTest, AssertsCompiledSQL):
+    __dialect__ = 'default'
+
+    def test_not_supported(self):
+        table1 = self.tables.mytable
+
+        dialect = default.DefaultDialect()
+        stmt = table1.insert().values([{'myid': 1}, {'myid': 2}])
+        assert_raises_message(
+            exc.CompileError,
+            "The 'default' dialect with current database version settings "
+                "does not support in-place multirow inserts.",
+            stmt.compile, dialect=dialect)
+
+    def test_named(self):
+        table1 = self.tables.mytable
+
+        values = [
+            {'myid': 1, 'name': 'a', 'description': 'b'},
+            {'myid': 2, 'name': 'c', 'description': 'd'},
+            {'myid': 3, 'name': 'e', 'description': 'f'}
+        ]
+
+        checkparams = {
+            'myid_0': 1,
+            'myid_1': 2,
+            'myid_2': 3,
+            'name_0': 'a',
+            'name_1': 'c',
+            'name_2': 'e',
+            'description_0': 'b',
+            'description_1': 'd',
+            'description_2': 'f',
+        }
+
+        dialect = default.DefaultDialect()
+        dialect.supports_multivalues_insert = True
+
+        self.assert_compile(table1.insert().values(values),
+            'INSERT INTO mytable (myid, name, description) VALUES '
+             '(:myid_0, :name_0, :description_0), '
+             '(:myid_1, :name_1, :description_1), '
+             '(:myid_2, :name_2, :description_2)',
+            checkparams=checkparams, dialect=dialect)
+
+    def test_positional(self):
+        table1 = self.tables.mytable
+
+        values = [
+            {'myid': 1, 'name': 'a', 'description': 'b'},
+            {'myid': 2, 'name': 'c', 'description': 'd'},
+            {'myid': 3, 'name': 'e', 'description': 'f'}
+        ]
+
+        checkpositional = (1, 'a', 'b', 2, 'c', 'd', 3, 'e', 'f')
+
+        dialect = default.DefaultDialect()
+        dialect.supports_multivalues_insert = True
+        dialect.paramstyle = 'format'
+        dialect.positional = True
+
+        self.assert_compile(table1.insert().values(values),
+            'INSERT INTO mytable (myid, name, description) VALUES '
+            '(%s, %s, %s), (%s, %s, %s), (%s, %s, %s)',
+            checkpositional=checkpositional, dialect=dialect)
+
+    def test_inline_default(self):
+        metadata = MetaData()
+        table = Table('sometable', metadata,
+            Column('id', Integer, primary_key=True),
+            Column('data', String),
+            Column('foo', Integer, default=func.foobar()))
+
+        values = [
+            {'id': 1, 'data': 'data1'},
+            {'id': 2, 'data': 'data2', 'foo': 'plainfoo'},
+            {'id': 3, 'data': 'data3'},
+        ]
+
+        checkparams = {
+            'id_0': 1,
+            'id_1': 2,
+            'id_2': 3,
+            'data_0': 'data1',
+            'data_1': 'data2',
+            'data_2': 'data3',
+            'foo_1': 'plainfoo',
+        }
+
+        self.assert_compile(table.insert().values(values),
+            'INSERT INTO sometable (id, data, foo) VALUES '
+            '(%(id_0)s, %(data_0)s, foobar()), '
+            '(%(id_1)s, %(data_1)s, %(foo_1)s), '
+            '(%(id_2)s, %(data_2)s, foobar())',
+            checkparams=checkparams, dialect=postgresql.dialect())
+
+    def test_server_default(self):
+        metadata = MetaData()
+        table = Table('sometable', metadata,
+            Column('id', Integer, primary_key=True),
+            Column('data', String),
+            Column('foo', Integer, server_default=func.foobar()))
+
+        values = [
+            {'id': 1, 'data': 'data1'},
+            {'id': 2, 'data': 'data2', 'foo': 'plainfoo'},
+            {'id': 3, 'data': 'data3'},
+        ]
+
+        checkparams = {
+            'id_0': 1,
+            'id_1': 2,
+            'id_2': 3,
+            'data_0': 'data1',
+            'data_1': 'data2',
+            'data_2': 'data3',
+        }
+
+        self.assert_compile(table.insert().values(values),
+            'INSERT INTO sometable (id, data) VALUES '
+            '(%(id_0)s, %(data_0)s), '
+            '(%(id_1)s, %(data_1)s), '
+            '(%(id_2)s, %(data_2)s)',
+            checkparams=checkparams, dialect=postgresql.dialect())
+
+    def test_server_default_absent_value(self):
+        metadata = MetaData()
+        table = Table('sometable', metadata,
+            Column('id', Integer, primary_key=True),
+            Column('data', String),
+            Column('foo', Integer, server_default=func.foobar()))
+
+        values = [
+            {'id': 1, 'data': 'data1', 'foo': 'plainfoo'},
+            {'id': 2, 'data': 'data2'},
+            {'id': 3, 'data': 'data3', 'foo': 'otherfoo'},
+        ]
+
+        checkparams = {
+            'id_0': 1,
+            'id_1': 2,
+            'id_2': 3,
+            'data_0': 'data1',
+            'data_1': 'data2',
+            'data_2': 'data3',
+            'foo_0': 'plainfoo',
+            'foo_2': 'otherfoo',
+        }
+
+        # note the effect here is that the first set of params
+        # takes effect for the rest of them, when one is absent
+        self.assert_compile(table.insert().values(values),
+            'INSERT INTO sometable (id, data, foo) VALUES '
+            '(%(id_0)s, %(data_0)s, %(foo_0)s), '
+            '(%(id_1)s, %(data_1)s, %(foo_0)s), '
+            '(%(id_2)s, %(data_2)s, %(foo_2)s)',
+            checkparams=checkparams, dialect=postgresql.dialect())