only modify test for >=1.2

Author: gijzelaerr

test/initdb.sh

@@ -11,6 +11,7 @@ monetdb stop $DATABASE || true
 monetdb destroy -f $DATABASE || true
 monetdb create $DATABASE
 monetdb release $DATABASE
+monetdb start $DATABASE
 echo "create schema test_schema;" | mclient -d $DATABASE
 echo "create schema test_schema2;" | mclient -d $DATABASE
 echo "alter user monetdb set schema test_schema2;" | mclient -d $DATABASE

test/initfarm.sh

@@ -2,7 +2,9 @@
 
 FARM="/tmp/monetdb"
 
+ps ax | grep monetdbd | grep -v grep | awk '{ print $1 }' | xargs kill -9
 
 monetdbd stop ${FARM} || true
+rm -rf ${FARM}
 monetdbd create ${FARM} || true
-monetdbd start ${FARM}
+monetdbd start ${FARM}

test/test_suite.py

@@ -3,14 +3,15 @@
 from sqlalchemy.testing.suite import ComponentReflectionTest as _ComponentReflectionTest
 from sqlalchemy.testing.suite import ExceptionTest as _ExceptionTest
 from sqlalchemy.testing.suite import OrderByLabelTest as _OrderByLabelTest
-
 from sqlalchemy import inspect
-from sqlalchemy.testing import eq_
+from sqlalchemy.testing import eq_, is_
 from sqlalchemy import testing
-from sqlalchemy.schema import DDL
+from sqlalchemy.schema import DDL, Index
 from sqlalchemy import event
 from sqlalchemy import MetaData
 
+major, minor = [int(i) for i in sa.__version__.split('.')[:2]]
+
 
 class ComponentReflectionTest(_ComponentReflectionTest):
     @testing.requires.foreign_key_constraint_reflection
@@ -41,15 +42,6 @@ def test_get_temp_table_unique_constraints(self):
         # TODO: it looks like MonetDB doesn't show constains for temp tables (yet)
         return
 
-        insp = inspect(self.bind)
-        reflected = insp.get_unique_constraints('user_tmp', schema='tmp')
-        for refl in reflected:
-            # Different dialects handle duplicate index and constraints
-            # differently, so ignore this flag
-            refl.pop('duplicates_index', None)
-        eq_(reflected, [{'column_names': ['name'], 'name': 'user_tmp_uq'}])
-
-
     @classmethod
     def define_temp_tables(cls, metadata):
         user_tmp = Table(
@@ -76,6 +68,13 @@ def define_temp_tables(cls, metadata):
 
     @classmethod
     def define_reflected_tables(cls, metadata, schema):
+        if major >= 1 and minor >= 2:
+            cls._define_reflected_tables_12(metadata, schema)
+        else:
+            super(ComponentReflectionTest, cls).define_reflected_tables(metadata, schema)
+
+    @classmethod
+    def _define_reflected_tables_12(cls, metadata, schema):
         if schema:
             schema_prefix = schema + "."
         else:
@@ -88,7 +87,8 @@ def define_reflected_tables(cls, metadata, schema):
                           Column('test2', sa.Float(5), nullable=False),
                           Column('parent_user_id', sa.Integer,
                                  sa.ForeignKey('%susers.user_id' %
-                                               schema_prefix)),
+                                               schema_prefix,
+                                               name='user_id_fk')),
                           schema=schema,
                           test_needs_fk=True,
                           )
@@ -101,9 +101,16 @@ def define_reflected_tables(cls, metadata, schema):
                           test_needs_fk=True,
                           )
 
-        # somehow the dependencies are not properly resolved, so i modified
-        # the standard test to have a reference to the address_id column
-        mail = Table('email_addresses', metadata,
+        Table("dingalings", metadata,
+              Column('dingaling_id', sa.Integer, primary_key=True),
+              Column('address_id', sa.Integer,
+                     sa.ForeignKey('%semail_addresses.address_id' %
+                                   schema_prefix)),
+              Column('data', sa.String(30)),
+              schema=schema,
+              test_needs_fk=True,
+              )
+        Table('email_addresses', metadata,
               Column('address_id', sa.Integer),
               Column('remote_user_id', sa.Integer,
                      sa.ForeignKey(users.c.user_id)),
@@ -112,24 +119,61 @@ def define_reflected_tables(cls, metadata, schema):
               schema=schema,
               test_needs_fk=True,
               )
-
-
-        Table("dingalings", metadata,
-              Column('dingaling_id', sa.Integer, primary_key=True),
-              Column('address_id', sa.Integer,
-                     sa.ForeignKey(mail.c.address_id)),
-              Column('data', sa.String(30)),
+        Table('comment_test', metadata,
+              Column('id', sa.Integer, primary_key=True, comment='id comment'),
+              Column('data', sa.String(20), comment='data % comment'),
+              Column(
+                  'd2', sa.String(20),
+                  comment=r"""Comment types type speedily ' " \ '' Fun!"""),
               schema=schema,
-              test_needs_fk=True,
-              )
+              comment=r"""the test % ' " \ table comment""")
 
         if testing.requires.index_reflection.enabled:
             cls.define_index(metadata, users)
+
+            if not schema:
+                noncol_idx_test_nopk = Table(
+                    'noncol_idx_test_nopk', metadata,
+                    Column('q', sa.String(5)),
+                )
+                noncol_idx_test_pk = Table(
+                    'noncol_idx_test_pk', metadata,
+                    Column('id', sa.Integer, primary_key=True),
+                    Column('q', sa.String(5)),
+                )
+                Index('noncol_idx_nopk', noncol_idx_test_nopk.c.q)
+                Index('noncol_idx_pk', noncol_idx_test_pk.c.q)
+
         if testing.requires.view_column_reflection.enabled:
             cls.define_views(metadata, schema)
         if not schema and testing.requires.temp_table_reflection.enabled:
             cls.define_temp_tables(metadata)
 
+    @testing.requires.index_reflection
+    def test_get_noncol_index_pk(self):
+        # TODO: not working for now?
+        return
+
+        tname = "noncol_idx_test_nopk"
+        ixname = "noncol_idx_nopk"
+        meta = self.metadata
+        insp = inspect(meta.bind)
+        indexes = insp.get_indexes(tname)
+
+        # reflecting an index that has "x DESC" in it as the column.
+        # the DB may or may not give us "x", but make sure we get the index
+        # back, it has a name, it's connected to the table.
+        expected_indexes = [
+            {'unique': False,
+             'name': ixname}
+        ]
+        self._assert_insp_indexes(indexes, expected_indexes)
+
+        t = Table(tname, meta, autoload_with=meta.bind)
+        eq_(len(t.indexes), 2)
+        is_(list(t.indexes)[0].table, t)
+        eq_(list(t.indexes)[0].name, ixname)
+
 
 class ExceptionTest(_ExceptionTest):
     """