|
From: Oleg B. <no...@so...> - 2015-03-14 16:30:39
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "SQLObject development repository".
The branch, master has been updated
via f0d1584bce8e31ffd14a791f1918b578f729f7d8 (commit)
via b22b17e121f4f4fb8ca623a7efaf78a349e8b9c5 (commit)
via c26b9f91af943b4fcbdd6e4f781a62a988717a8d (commit)
via be92994f30e715b4fefc68212dea9c1a28a4daf3 (commit)
from c39c3259220603258048fa0144a00dd8b5ab0f59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceforge.net/p/sqlobject/sqlobject/ci/f0d1584bce8e31ffd14a791f1918b578f729f7d8
commit f0d1584bce8e31ffd14a791f1918b578f729f7d8
Author: Oleg Broytman <ph...@ph...>
Date: Sat Mar 14 19:28:08 2015 +0300
Document using fdb adapter for Firebird
diff --git a/docs/News.txt b/docs/News.txt
index 28a9017..da4c1ea 100644
--- a/docs/News.txt
+++ b/docs/News.txt
@@ -13,6 +13,8 @@ SQLObject 3.0.0 (master)
Minor features
--------------
+* Use fdb adapter for Firebird.
+
* PyDispatcher (>=2.0.4) was made an external dependency.
Development
diff --git a/docs/SQLObject.txt b/docs/SQLObject.txt
index d4bb0b4..c528146 100644
--- a/docs/SQLObject.txt
+++ b/docs/SQLObject.txt
@@ -57,6 +57,7 @@ ADODBAPI_ (Win32).
.. _SQLite: http://sqlite.org
.. _PySQLite: http://initd.org/projects/pysqlite
.. _Firebird: http://firebird.sourceforge.net
+.. _fdb: http://www.firebirdsql.org/en/devel-python-driver/
.. _kinterbasdb: http://kinterbasdb.sourceforge.net/
.. _`MAX DB`: http://www.mysql.com/products/maxdb/
.. _sapdb: http://www.sapdb.org/sapdbPython.html
@@ -1836,7 +1837,7 @@ using lazy selects. Try ``list(MyClass.select())`` to avoid
concurrent cursors if you have problems (using ``list()`` will
pre-fetch all the results of a select).
-Firebird support uses the kinterbasdb_ Python library.
+Firebird support uses fdb_ or kinterbasdb_ Python library.
.. _kinterbasdb: http://kinterbasdb.sourceforge.net/
diff --git a/setup.py b/setup.py
index f89bc38..013eb00 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ if is_setuptools:
'mysql': ['MySQLdb'],
'postgresql': ['psycopg'], # or pgdb from PyGreSQL
'sqlite': ['pysqlite'],
- 'firebird': ['kinterbasdb'],
+ 'firebird': ['fdb'], # or kinterbasdb
'sybase': ['Sybase'],
'mssql': ['adodbapi'], # or pymssql
'sapdb': ['sapdb'],
http://sourceforge.net/p/sqlobject/sqlobject/ci/b22b17e121f4f4fb8ca623a7efaf78a349e8b9c5
commit b22b17e121f4f4fb8ca623a7efaf78a349e8b9c5
Author: Oleg Broytman <ph...@ph...>
Date: Sat Mar 14 19:27:39 2015 +0300
Remove global kinterbasdb variable
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index 8a9cbde..b40086f 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -4,9 +4,6 @@ import warnings
from sqlobject import col
from sqlobject.dbconnection import DBAPI
-kinterbasdb = None
-
-
class FirebirdConnection(DBAPI):
supportTransactions = False
@@ -18,18 +15,16 @@ class FirebirdConnection(DBAPI):
def __init__(self, host, db, port='3050', user='sysdba',
password='masterkey', autoCommit=1,
dialect=None, role=None, charset=None, **kw):
- global kinterbasdb
- if kinterbasdb is None:
- try:
- import fdb
- kinterbasdb = fdb
- except ImportError:
- import kinterbasdb
- # See http://kinterbasdb.sourceforge.net/dist_docs/usage.html
- # for an explanation; in short: use datetime, decimal and
- # unicode.
- kinterbasdb.init(type_conv=200)
- self.module = kinterbasdb
+ try:
+ import fdb
+ self.module = fdb
+ except ImportError:
+ import kinterbasdb
+ # See http://kinterbasdb.sourceforge.net/dist_docs/usage.html
+ # for an explanation; in short: use datetime, decimal and
+ # unicode.
+ kinterbasdb.init(type_conv=200)
+ self.module = kinterbasdb
self.host = host
self.port = port
http://sourceforge.net/p/sqlobject/sqlobject/ci/c26b9f91af943b4fcbdd6e4f781a62a988717a8d
commit c26b9f91af943b4fcbdd6e4f781a62a988717a8d
Merge: c39c325 be92994
Author: Oleg Broytman <ph...@ph...>
Date: Sat Mar 14 19:11:03 2015 +0300
Merge pull request #113 from drnlm/Use_fdb_for_firebird
Try use fdb first before falling back to kinterbasdb
http://sourceforge.net/p/sqlobject/sqlobject/ci/be92994f30e715b4fefc68212dea9c1a28a4daf3
commit be92994f30e715b4fefc68212dea9c1a28a4daf3
Author: Neil <drn...@gm...>
Date: Sat Mar 14 16:23:21 2015 +0200
Try use fdb first before falling back to kinterbasdb
diff --git a/sqlobject/firebird/firebirdconnection.py b/sqlobject/firebird/firebirdconnection.py
index ba59c3b..8a9cbde 100644
--- a/sqlobject/firebird/firebirdconnection.py
+++ b/sqlobject/firebird/firebirdconnection.py
@@ -20,10 +20,15 @@ class FirebirdConnection(DBAPI):
dialect=None, role=None, charset=None, **kw):
global kinterbasdb
if kinterbasdb is None:
- import kinterbasdb
- # See http://kinterbasdb.sourceforge.net/dist_docs/usage.html
- # for an explanation; in short: use datetime, decimal and unicode.
- kinterbasdb.init(type_conv=200)
+ try:
+ import fdb
+ kinterbasdb = fdb
+ except ImportError:
+ import kinterbasdb
+ # See http://kinterbasdb.sourceforge.net/dist_docs/usage.html
+ # for an explanation; in short: use datetime, decimal and
+ # unicode.
+ kinterbasdb.init(type_conv=200)
self.module = kinterbasdb
self.host = host
-----------------------------------------------------------------------
Summary of changes:
docs/News.txt | 2 ++
docs/SQLObject.txt | 3 ++-
setup.py | 2 +-
sqlobject/firebird/firebirdconnection.py | 14 +++++++-------
4 files changed, 12 insertions(+), 9 deletions(-)
hooks/post-receive
--
SQLObject development repository
|
