[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7461 - in trunk/gnue-common/src/datasources: . drivers/DBSIG2 dr
|
From: |
reinhard |
|
Subject: |
[gnue] r7461 - in trunk/gnue-common/src/datasources: . drivers/DBSIG2 drivers/adodbapi/adodbapi drivers/interbase/interbase drivers/mysql/mysql drivers/oracle/cxoracle drivers/oracle/dcoracle drivers/postgresql/psycopg drivers/postgresql/pygresql drivers/postgresql/pypgsql drivers/sapdb/sapdb drivers/sqlite/sqlite |
|
Date: |
Fri, 22 Apr 2005 10:54:19 -0500 (CDT) |
Author: reinhard
Date: 2005-04-22 10:54:17 -0500 (Fri, 22 Apr 2005)
New Revision: 7461
Modified:
trunk/gnue-common/src/datasources/GConnections.py
trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py
trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py
trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
Log:
Use __initplugin__ to test if the DBSIG2 module is installed. Among other good
things, this enables epydoc to import all plugins even if the DBSIG2 module is
not available.
Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py 2005-04-22 14:53:23 UTC
(rev 7460)
+++ trunk/gnue-common/src/datasources/GConnections.py 2005-04-22 15:54:17 UTC
(rev 7461)
@@ -250,19 +250,8 @@
behavior = parameters.get ('behavior','').lower ().replace ('/', '.')
dbdriver = plugin.find (driver, 'gnue.common.datasources.drivers',
'Connection')
+ conn = dbdriver.Connection (self, connection_name, parameters)
- try:
- conn = dbdriver.Connection (self, connection_name, parameters)
-
- except TypeError:
- # Check for the case that a "Connection" is passed instead of a
- # "Connection" class. This is the case, when the procedure for deferal of
- # the loading of the connection object is overwriten by the "connection"
- # module. i.e. there is a Connection.py file
- # TODO: remove this extra check by cleaning up the whole loading
- # procedure
- conn = dbdriver.Connection.Connection (self, connection_name, parameters)
-
self._openConnections [connection_name] = conn
# Create the introspection instance
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -45,10 +45,10 @@
The base class for all drivers that use DBSIG2 compatible modules.
Driver plugins derived from this driver must subclass this class and
- overwrite at least the L{_driver} class variable and implement the
+ overwrite at least the L{_drivername} class variable and implement the
L{_getConnectParams} method.
- @cvar _driver: The loaded Python module of the DBSIG2 driver. Must be
+ @cvar _drivername: The Python module name of the DBSIG2 driver. Must be
overwritten by descendants.
@cvar _boolean_false: Value to post to the database for boolean FALSE
(defaults to False). Can be overwritten by descendants.
@@ -66,7 +66,7 @@
supportedDataObjects = {'object': DataObject.DataObject_Object,
'sql': DataObject.DataObject_SQL}
- _driver = None # DBSIG2 compatible driver module
+ _drivername = None # DBSIG2 compatible driver module
_boolean_false = False # value to pass for boolean FALSE
_boolean_true = True # value to pass for boolean TRUE
_broken_fetchmany = False # Does fetchmany () raise an exception
@@ -83,6 +83,8 @@
Base.Connection.__init__ (self, connections, name, parameters)
+ self._driver = __import__ (self._drivername, None, None, '*')
+
# Encoding used to communicate with the database (not used by all drivers)
if parameters.has_key ('encoding'):
self._encoding = parameters ['encoding']
Modified:
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -25,18 +25,6 @@
import string
-from gnue.common.datasources import GConnections
-
-try:
- import adodbapi
-except ImportError:
- raise GConnections.DependencyError, ('adodbapi', None)
-
-try:
- import win32com
-except ImportError:
- raise GConnections.DependencyError, ('win32com', None)
-
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.adodbapi.Schema.Discovery.Introspection
import Introspection
@@ -50,8 +38,7 @@
Connection class for ADO databases.
"""
- _driver = adodbapi
- _driver.defaultIsolationLevel = adodbapi.adXactSerializable
+ _drivername = 'adodbapi'
_broken_rowcount = True
@@ -64,6 +51,8 @@
def _getConnectParams (self, connectData):
+ adodbapi.defaultIsolationLevel = adodbapi.adXactSerializable
+
# mandatory parameters
params = {'Provider' : connectData ['oledb_provider'],
'Data Source': connectData ['data_source'],
Modified:
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -22,14 +22,20 @@
adodbapi init file
"""
+from Connection import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Connection
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Connection import Connection as C
- return C(*args, **parms)
+ from gnue.common.datasources import GConnections
+ try:
+ import adodbapi
+ except ImportError:
+ raise GConnections.DependencyError, ('adodbapi', None)
+ try:
+ import win32com
+ except ImportError:
+ raise GConnections.DependencyError, ('win32com', None)
Modified:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,13 +23,6 @@
__all__ = ['Connection']
-from gnue.common.datasources import GConnections
-
-try:
- import kinterbasdb
-except ImportError:
- raise GConnections.DependencyError, ('Kinterbasdb', None)
-
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.interbase.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.interbase.Schema.Discovery.Introspection
import Introspection
@@ -44,12 +37,12 @@
Connection class for Interbase databases.
"""
- _driver = kinterbasdb
+ _drivername = 'kinterbasdb'
- _broken_rowcount = True
+ _broken_rowcount = True
- defaultBehavior = Introspection
- defaultCreator = Creation
+ defaultBehavior = Introspection
+ defaultCreator = Creation
# ---------------------------------------------------------------------------
Modified:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -22,18 +22,23 @@
interbase init file
"""
+from Connection import Connection
+
+
+# -----------------------------------------------------------------------------
# Define alias for 'firebird'
+# -----------------------------------------------------------------------------
+
__pluginalias__ = ['firebird']
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Connection
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Connection import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ import kinterbasdb
+ except ImportError:
+ raise GConnections.DependencyError, ('Kinterbasdb', None)
Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,14 +23,6 @@
__all__ = ['Connection']
-from gnue.common.datasources import GConnections
-
-try:
- import MySQLdb
-except ImportError:
- raise GConnections.DependencyError ('mysql-python',
- 'http://sourceforge.net/projects/mysql-python')
-
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.mysql.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.mysql.Schema.Discovery.Introspection
import Introspection
@@ -45,7 +37,7 @@
Connection class for Interbase databases.
"""
- _driver = MySQLdb
+ _drivername = 'MySQLdb'
defaultBehavior = Introspection
defaultCreator = Creation
Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -22,15 +22,17 @@
MySQLdb dataobject driver
"""
+from Connection import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Connection
-
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Connection import Connection as C
- return C(*args, **parms)
+ from gnue.common.datasources import GConnections
+ try:
+ import MySQLdb
+ except ImportError:
+ raise GConnections.DependencyError ('mysql-python',
+ 'http://sourceforge.net/projects/mysql-python')
Modified: trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/Driver.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,15 +23,9 @@
__all__ = ('Connection')
-from gnue.common.datasources import GConnections
from gnue.common.datasources.drivers.oracle import Base
-try:
- import cx_Oracle
-except ImportError:
- raise GConnections.DependencyError, ('cx_Oracle', None)
-
# =============================================================================
# Oracle Connection class using cxoracle
# =============================================================================
@@ -40,4 +34,4 @@
"""
Connection class for Oracle databases using the cxoracle DBSIG2 driver.
"""
- _driver = cx_Oracle
+ _drivername = 'cx_Oracle'
Modified: trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/oracle/cxoracle/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -27,15 +27,16 @@
specification.
"""
+from Driver import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Driver
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Driver import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ import cx_Oracle
+ except ImportError:
+ raise GConnections.DependencyError, ('cx_Oracle', None)
Modified: trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/Driver.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,15 +23,9 @@
__all__ = ('Connection')
-from gnue.common.datasources import GConnections
from gnue.common.datasources.drivers.oracle import Base
-try:
- import DCOracle2
-except ImportError:
- raise GConnections.DependencyError ('DCOracle2', None)
-
# =============================================================================
# Oracle Connection class using dcoracle
# =============================================================================
@@ -40,4 +34,4 @@
"""
Connection class for Oracle databases using the cxoracle DBSIG2 driver.
"""
- _driver = DCOracle2
+ _drivername = 'DCOracle2'
Modified: trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/oracle/dcoracle/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -26,27 +26,17 @@
Oracle implementation of dbdriver using Python DB-SIG v2
specification.
"""
-# NOTES:
-#
-__description__ = _("DCOracle2 Data Driver for Oracle 7.3/8i/9i+ (OCI8)")
-__driverurl__ = "http://www.zope.org/Products/DCOracle2/";
-__examples__ = """
- Supported attributes (via connections.conf or <connection> tag)
+from Driver import Connection
- service= This is the Oracle TNS name for your connection (required)
-"""
-__doc__ = ""
+# -----------------------------------------------------------------------------
# Test if plugin is functional
-def __initplugin__ ():
- import Driver
+# -----------------------------------------------------------------------------
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Driver import Connection as C
- return C(*args, **parms)
-
+def __initplugin__ ():
+ from gnue.common.datasources import GConnections
+ try:
+ import DCOracle2
+ except ImportError:
+ raise GConnections.DependencyError ('DCOracle2', None)
Modified: trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/Driver.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,15 +23,9 @@
__all__ = ('Connection')
-from gnue.common.datasources import GConnections
from gnue.common.datasources.drivers.postgresql import Base
-try:
- import psycopg
-except:
- raise GConnections.DependencyError, ('psycopg', None)
-
# =============================================================================
# PostgreSQL Connection class using psycopg
# =============================================================================
@@ -40,4 +34,4 @@
"""
Connection class for PostgreSQL databases using the psycopg DBSIG2 driver.
"""
- _driver = psycopg
+ _drivername = 'psycopg'
Modified:
trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/psycopg/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -27,15 +27,16 @@
specification.
"""
+from Driver import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Driver
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Driver import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ import psycopg
+ except:
+ raise GConnections.DependencyError, ('psycopg', None)
Modified:
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/Driver.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,15 +23,9 @@
__all__ = ('Connection')
-from gnue.common.datasources import GConnections
from gnue.common.datasources.drivers.postgresql import Base
-try:
- import pgdb
-except ImportError:
- raise GConnections.DependencyError, ('pygresql', None)
-
# =============================================================================
# PostgreSQL Connection class using PyGreSQL
# =============================================================================
@@ -40,4 +34,4 @@
"""
Connection class for PostgreSQL databases using the PyGreSQL DBSIG2 driver.
"""
- _driver = pgdb
+ _drivername = 'pgdb'
Modified:
trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pygresql/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -27,15 +27,16 @@
specification.
"""
+from Driver import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Driver
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Driver import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ import pgdb
+ except ImportError:
+ raise GConnections.DependencyError, ('pygresql', None)
Modified: trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,15 +23,9 @@
__all__ = ('Connection')
-from gnue.common.datasources import GConnections
from gnue.common.datasources.drivers.postgresql import Base
-try:
- from pyPgSQL import PgSQL
-except:
- raise GConnections.DependencyError, ('pyPgSQL', None)
-
# =============================================================================
# PostgreSQL Connection class using pyPgSQL
# =============================================================================
@@ -40,5 +34,5 @@
"""
Connection class for PostgreSQL databases using the pyPgSQL DBSIG2 driver.
"""
- _driver = PgSQL
+ _drivername = 'PgSQL'
_broken_fetchmany = True
Modified:
trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -27,15 +27,16 @@
specification.
"""
+from Driver import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Driver
-
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Driver import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ from pyPgSQL import PgSQL
+ except:
+ raise GConnections.DependencyError, ('pyPgSQL', None)
Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,13 +23,6 @@
__all__ = ['Connection']
-from gnue.common.datasources import GConnections
-
-try:
- import sapdb.dbapi
-except ImportError:
- raise GConnections.DependencyError, ('sapdb', None)
-
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sapdb.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.sapdb.Schema.Discovery.Introspection
import Introspection
@@ -44,12 +37,12 @@
Connection class for MaxDB and SAP-DB databases.
"""
- _driver = sapdb.dbapi
+ _drivername = 'sapdb.dbapi'
_named_as_sequence = True
- defaultBehavior = Introspection
- defaultCreator = Creation
+ defaultBehavior = Introspection
+ defaultCreator = Creation
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -22,17 +22,23 @@
init file
"""
+from Connection import Connection
+
+
+# -----------------------------------------------------------------------------
# Define alias
+# -----------------------------------------------------------------------------
+
__pluginalias__ = ['maxdb']
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Connection
-
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Connection import Connection as C
- return C(*args, **parms)
-
+ from gnue.common.datasources import GConnections
+ try:
+ import sapdb.dbapi
+ except ImportError:
+ raise GConnections.DependencyError, ('sapdb', None)
Modified: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -23,27 +23,6 @@
__all__ = ['Connection']
-from gnue.common.datasources import GConnections
-
-try:
- import sqlite
-
- # This is a workaround for a bug in PySQLite. All the following mebers are
- # not imported from main.py in __init__.py
- if not hasattr (sqlite, 'Timestamp') and sqlite.main.have_datetime:
- sqlite.Date = sqlite.main.Date
- sqlite.Time = sqlite.main.Time
- sqlite.Timestamp = sqlite.main.Timestamp
- sqlite.DateFromTicks = sqlite.main.DateFromTicks
- sqlite.TimeFromTicks = sqlite.main.TimeFromTicks
- sqlite.TimestampFromTicks = sqlite.main.TimestampFromTicks
-
- sqlite.DateTimeType = sqlite.main.DateTimeType
- sqlite.DateTimeDeltaType = sqlite.main.DateTimeDeltaType
-
-except ImportError:
- raise GConnections.DependencyError, ('SQLitedbapi', None)
-
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sqlite.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.sqlite.Schema.Discovery.Introspection
import Introspection
@@ -55,11 +34,11 @@
class Connection (DBSIG2.Connection):
- _driver = sqlite
+ _drivername = 'sqlite'
# SQLite doesn't like boolean type in SQL parameters
- _boolean_true = 1
- _boolean_false = 0
+ _boolean_true = 1
+ _boolean_false = 0
defaultBehavior = Introspection
defaultCreator = Creation
Modified: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
2005-04-22 14:53:23 UTC (rev 7460)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/__init__.py
2005-04-22 15:54:17 UTC (rev 7461)
@@ -22,15 +22,30 @@
sqlite init file
"""
+from Connection import Connection
+
+
+# -----------------------------------------------------------------------------
# Test if plugin is functional
+# -----------------------------------------------------------------------------
+
def __initplugin__ ():
- import Connection
+ from gnue.common.datasources import GConnections
+ try:
+ import sqlite
+
+ # This is a workaround for a bug in PySQLite. All the following mebers are
+ # not imported from main.py in __init__.py
+ if not hasattr (sqlite, 'Timestamp') and sqlite.main.have_datetime:
+ sqlite.Date = sqlite.main.Date
+ sqlite.Time = sqlite.main.Time
+ sqlite.Timestamp = sqlite.main.Timestamp
+ sqlite.DateFromTicks = sqlite.main.DateFromTicks
+ sqlite.TimeFromTicks = sqlite.main.TimeFromTicks
+ sqlite.TimestampFromTicks = sqlite.main.TimestampFromTicks
-#
-# Stub code to not initialize the Connection until needed.
-# This greatly helps with error messages.
-#
-def Connection(*args, **parms):
- from Connection import Connection as C
- return C(*args, **parms)
+ sqlite.DateTimeType = sqlite.main.DateTimeType
+ sqlite.DateTimeDeltaType = sqlite.main.DateTimeDeltaType
+ except ImportError:
+ raise GConnections.DependencyError, ('SQLitedbapi', None)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7461 - in trunk/gnue-common/src/datasources: . drivers/DBSIG2 drivers/adodbapi/adodbapi drivers/interbase/interbase drivers/mysql/mysql drivers/oracle/cxoracle drivers/oracle/dcoracle drivers/postgresql/psycopg drivers/postgresql/pygresql drivers/postgresql/pypgsql drivers/sapdb/sapdb drivers/sqlite/sqlite,
reinhard <=