From 82c11cc94b41323caeecc9990d1d87ed9fed4b7c Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 3 Jun 2013 13:53:42 -0400 Subject: - fdb is now official, [ticket:2504] - restore the rollback cleanup handler, pg8000 is mostly obsolete as a dialect and the firebird drivers need it --- lib/sqlalchemy/dialects/firebird/__init__.py | 2 +- lib/sqlalchemy/dialects/firebird/fdb.py | 8 ++++---- lib/sqlalchemy/testing/engines.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/sqlalchemy') diff --git a/lib/sqlalchemy/dialects/firebird/__init__.py b/lib/sqlalchemy/dialects/firebird/__init__.py index 0f4853bfb..e57457a39 100644 --- a/lib/sqlalchemy/dialects/firebird/__init__.py +++ b/lib/sqlalchemy/dialects/firebird/__init__.py @@ -6,7 +6,7 @@ from sqlalchemy.dialects.firebird import base, kinterbasdb, fdb -base.dialect = kinterbasdb.dialect +base.dialect = fdb.dialect from sqlalchemy.dialects.firebird.base import \ SMALLINT, BIGINT, FLOAT, FLOAT, DATE, TIME, \ diff --git a/lib/sqlalchemy/dialects/firebird/fdb.py b/lib/sqlalchemy/dialects/firebird/fdb.py index 292f15c72..8d0bd3d78 100644 --- a/lib/sqlalchemy/dialects/firebird/fdb.py +++ b/lib/sqlalchemy/dialects/firebird/fdb.py @@ -15,11 +15,11 @@ .. versionadded:: 0.8 - Support for the fdb Firebird driver. -Status ------- - -The fdb dialect is new and not yet tested (can't get fdb to build). + .. versionchanged:: 0.9 - The fdb dialect is now the default dialect + under the ``firebird://`` URL space, as ``fdb`` is now the official + Python driver for Firebird. +The dialect currently accepts the same arguments as the Kinterbasdb driver. """ diff --git a/lib/sqlalchemy/testing/engines.py b/lib/sqlalchemy/testing/engines.py index efc0103f2..d8c1709e7 100644 --- a/lib/sqlalchemy/testing/engines.py +++ b/lib/sqlalchemy/testing/engines.py @@ -47,13 +47,13 @@ class ConnectionKiller(object): self._safe(rec._close) def _after_test_ctx(self): - pass # this can cause a deadlock with pg8000 - pg8000 acquires # prepared statment lock inside of rollback() - if async gc # is collecting in finalize_fairy, deadlock. - # not sure if this should be if pypy/jython only - #for conn in self.conns: - # self._safe(conn.rollback) + # not sure if this should be if pypy/jython only. + # note that firebird/fdb definitely needs this though + for conn in self.conns: + self._safe(conn.rollback) def _stop_test_ctx(self): if config.options.low_connections: -- cgit v1.2.1