diff options
Diffstat (limited to 'lib/sqlalchemy/testing')
| -rw-r--r-- | lib/sqlalchemy/testing/provision.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/requirements.py | 20 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/schema.py | 10 |
3 files changed, 23 insertions, 13 deletions
diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py index 13a5ea078..21bacfca2 100644 --- a/lib/sqlalchemy/testing/provision.py +++ b/lib/sqlalchemy/testing/provision.py @@ -21,9 +21,10 @@ class register(object): def init(cls, fn): return register().for_db("*")(fn) - def for_db(self, dbname): + def for_db(self, *dbnames): def decorate(fn): - self.fns[dbname] = fn + for dbname in dbnames: + self.fns[dbname] = fn return self return decorate @@ -138,6 +139,7 @@ def _generate_driver_urls(url, extra_drivers): main_driver = url.get_driver_name() extra_drivers.discard(main_driver) + url = generate_driver_url(url, main_driver) yield str(url) for drv in list(extra_drivers): diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py index 36d0ce4c6..3d3980b30 100644 --- a/lib/sqlalchemy/testing/requirements.py +++ b/lib/sqlalchemy/testing/requirements.py @@ -19,7 +19,6 @@ import platform import sys from . import exclusions -from . import fails_on_everything_except from .. import util @@ -408,6 +407,15 @@ class SuiteRequirements(Requirements): return exclusions.closed() @property + def emulated_lastrowid_even_with_sequences(self): + """"target dialect retrieves cursor.lastrowid or an equivalent + after an insert() construct executes, even if the table has a + Sequence on it. + + """ + return exclusions.closed() + + @property def dbapi_lastrowid(self): """"target platform includes a 'lastrowid' accessor on the DBAPI cursor object. @@ -1246,13 +1254,3 @@ class SuiteRequirements(Requirements): lambda config: not config.db.dialect.supports_is_distinct_from, "driver doesn't support an IS DISTINCT FROM construct", ) - - @property - def emulated_lastrowid_even_with_sequences(self): - """"target dialect retrieves cursor.lastrowid or an equivalent - after an insert() construct executes, even if the table has a - Sequence on it.. - """ - return fails_on_everything_except( - "mysql", "sqlite+pysqlite", "sqlite+pysqlcipher", "sybase", - ) diff --git a/lib/sqlalchemy/testing/schema.py b/lib/sqlalchemy/testing/schema.py index ab527cae3..f5bd1f7a2 100644 --- a/lib/sqlalchemy/testing/schema.py +++ b/lib/sqlalchemy/testing/schema.py @@ -33,6 +33,16 @@ def Table(*args, **kw): kw["mysql_engine"] = "InnoDB" else: kw["mysql_engine"] = "MyISAM" + elif exclusions.against(config._current, "mariadb"): + if ( + "mariadb_engine" not in kw + and "mariadb_type" not in kw + and "autoload_with" not in kw + ): + if "test_needs_fk" in test_opts or "test_needs_acid" in test_opts: + kw["mariadb_engine"] = "InnoDB" + else: + kw["mariadb_engine"] = "MyISAM" # Apply some default cascading rules for self-referential foreign keys. # MySQL InnoDB has some issues around selecting self-refs too. |