[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7791 - in trunk/gnue-common/src/datasources/drivers: other sql/i
|
From: |
reinhard |
|
Subject: |
[gnue] r7791 - in trunk/gnue-common/src/datasources/drivers: other sql/interbase sql/maxdb sql/msado sql/mysql sql/oracle sql/postgresql sql/sqlite2 sql/sqlite3 |
|
Date: |
Sat, 6 Aug 2005 14:14:13 -0500 (CDT) |
Author: reinhard
Date: 2005-08-06 14:14:11 -0500 (Sat, 06 Aug 2005)
New Revision: 7791
Modified:
trunk/gnue-common/src/datasources/drivers/other/appserver.py
trunk/gnue-common/src/datasources/drivers/sql/interbase/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/msado/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py
trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
trunk/gnue-common/src/datasources/drivers/sql/oracle/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py
trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.py
trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py
trunk/gnue-common/src/datasources/drivers/sql/sqlite3/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py
Log:
More cleanup, docstrings, comments.
Modified: trunk/gnue-common/src/datasources/drivers/other/appserver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/other/appserver.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/other/appserver.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -113,7 +113,7 @@
Base.Behavior.__init__ (self, connection)
- self._RELTYPE = {'type': 'object', 'name': u_('Business Object Class')}
+ self.__RELTYPE = {'type': 'object', 'name': u_('Business Object Class')}
# ---------------------------------------------------------------------------
@@ -151,7 +151,7 @@
for (gid, module, name) in sm.fetch (sid, lid, 0, sm.count (sid, lid)):
fullname = "%s_%s" % (module, name)
master = parent.findChildOfType ('GSTables') or \
- GSchema.GSTables (parent, **self._RELTYPE)
+ GSchema.GSTables (parent, **self.__RELTYPE)
result [gid] = GSchema.GSTable (master, name = fullname, id = gid)
return result
Modified: trunk/gnue-common/src/datasources/drivers/sql/interbase/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/interbase/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/interbase/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for Firebird/Interbase backends.
"""
+__all__ = ['Behavior']
+
import re
from gnue.common.datasources import GLoginHandler, GSchema
@@ -52,17 +54,18 @@
DBSIG2.Behavior.__init__ (self, connection)
- self._RELTYPE = {False: {'type': 'table', 'name': _('Tables')},
- True : {'type': 'view' , 'name': _('Views')}}
+ self.__RELTYPE = {False: {'type': 'table', 'name': _('Tables')},
+ True : {'type': 'view' , 'name': _('Views')}}
+ self.__TYPEMAP = {'DATE' : 'date',
+ 'TIME' : 'time',
+ 'TIMESTAMP': 'datetime'}
+ self.__NOW = re.compile ("'(NOW\s*\(\)\s*)'", re.IGNORECASE)
+ self.__GENFIELD = re.compile ('^.*NEW\.(\w+)\s*=\s*GEN_ID\s*\(.*\)',
+ re.IGNORECASE)
+ self.__maxVarchar = 10921
- self._TYPEMAP = {'DATE': 'date', 'TIME': 'time', 'TIMESTAMP': 'datetime'}
- self._NOW = re.compile ("'(NOW\s*\(\)\s*)'", re.IGNORECASE)
- self._GENFIELD = re.compile ('^.*NEW\.(\w+)\s*=\s*GEN_ID\s*\(.*\)',
- re.IGNORECASE)
-
self._maxIdLength_ = 31
self._alterMultiple_ = False
- self._maxVarchar = 10921
self._numbers_ = [[(4, 'SMALLINT'), (9, 'INTEGER')], "NUMERIC(%s)",
"NUMERIC (%(length)s,%(scale)s)"]
@@ -169,7 +172,7 @@
for rs in cursor.fetchall ():
(name, source) = self.__stripStrings (rs)
- reltype = self._RELTYPE [source is not None]
+ reltype = self.__RELTYPE [source is not None]
if not reltype ['type'] in masters:
masters [reltype ['type']] = GSchema.GSTables (parent, **reltype)
@@ -215,8 +218,8 @@
if fsrc == 'BOOLEAN':
attrs ['type'] = 'boolean'
- elif nativetype in self._TYPEMAP:
- attrs ['type'] = self._TYPEMAP [nativetype]
+ elif nativetype in self.__TYPEMAP:
+ attrs ['type'] = self.__TYPEMAP [nativetype]
elif nativetype in ['DOUBLE', 'FLOAT', 'INT64', 'LONG', 'QUAD', \
'SHORT']:
@@ -232,7 +235,7 @@
attrs ['length'] = clen
if default is not None:
- if self._NOW.search (default) is not None:
+ if self.__NOW.search (default) is not None:
attrs ['defaultwith'] = 'timestamp'
else:
attrs ['defaultwith'] = 'constant'
@@ -378,7 +381,7 @@
if not relname in tables:
continue
- match = self._GENFIELD.match (source)
+ match = self.__GENFIELD.match (source)
if match is not None:
fieldname = match.groups () [0].upper ()
fields = tables [relname].findChildrenOfType ('GSField', False, True)
@@ -447,11 +450,11 @@
@return: string with the native datatype
"""
- if hasattr (field, 'length') and field.length <= self._maxVarchar:
+ if hasattr (field, 'length') and field.length <= self.__maxVarchar:
return "varchar (%s)" % field.length
elif not hasattr (field, 'length'):
- return "varchar (%s)" % self._maxVarchar
+ return "varchar (%s)" % self.__maxVarchar
else:
return "blob"
Modified: trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for MaxDB/SAP-DB backends.
"""
+__all__ = ['Behavior']
+
from gnue.common.apps import errors
from gnue.common.datasources import GLoginHandler, GSchema
from gnue.common.datasources.drivers import DBSIG2
@@ -50,12 +52,13 @@
DBSIG2.Behavior.__init__ (self, connection)
- self._RELKIND = {'TABLE' : {'type': 'table' , 'name': _('Tables')},
- 'VIEW' : {'type': 'view' , 'name': _('Views')},
- # 'SYNONYM': {'type': 'synonym', 'name': _('Synonyms')},
- # 'RESULT' : {'type': 'result' , 'name': _('Result
Table')}
- }
- self._maxVarchar = 3999
+ self.__RELKIND = {'TABLE' : {'type': 'table' , 'name': _('Tables')},
+ 'VIEW' : {'type': 'view' , 'name': _('Views')},
+ # 'SYNONYM': {'type': 'synonym', 'name': _('Synonyms')},
+ # 'RESULT' : {'type': 'result' ,
+ # 'name': _('Result Table')}
+ }
+ self.__maxVarchar = 3999
self._maxIdLength_ = 32
self._numbers_ = [[(5, 'SMALLINT'), (10, 'INTEGER')],
@@ -156,7 +159,7 @@
# ---------------------------------------------------------------------------
- # Read all relations of the types listed in _RELKINDS
+ # Read all relations of the types listed in __RELKIND
# ---------------------------------------------------------------------------
def __readTables (self, parent):
@@ -170,10 +173,10 @@
cursor = self.__connection.makecursor (cmd)
try:
for (relid, name, kind, owner) in cursor.fetchall ():
- if not kind in self._RELKIND:
+ if not kind in self.__RELKIND:
continue
if not kind in masters:
- masters [kind] = GSchema.GSTables (parent, **self._RELKIND [kind])
+ masters [kind] = GSchema.GSTables (parent, **self.__RELKIND [kind])
attrs = {'id' : relid,
'name' : name,
@@ -372,9 +375,9 @@
@return: 'VARCHAR (?)' or 'LONG'
"""
- length = hasattr (field, 'length') and field.length or self._maxVarchar
+ length = hasattr (field, 'length') and field.length or self.__maxVarchar
- if length <= self._maxVarchar:
+ if length <= self.__maxVarchar:
return "VARCHAR (%d)" % length
else:
Modified: trunk/gnue-common/src/datasources/drivers/sql/msado/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/msado/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/msado/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for MS-ADO backends.
"""
+__all__ = ['Behavior']
+
from gnue.common.datasources import GSchema
from gnue.common.datasources.drivers import Base
@@ -44,10 +46,10 @@
def __init__ (self, connection):
- Base.__init__ (self, connection)
+ Base.Behavior.__init__ (self, connection)
- self._RELKIND = {'TABLE': {'type': 'table', 'name': _('Tables')},
- 'VIEW' : {'type': 'view', 'name': _('Views')}}
+ self.__RELKIND = {'TABLE': {'type': 'table', 'name': _('Tables')},
+ 'VIEW' : {'type': 'view', 'name': _('Views')}}
# ---------------------------------------------------------------------------
@@ -55,8 +57,6 @@
# ---------------------------------------------------------------------------
def _readSchema_ (self, parent):
- """
- """
self._TYPEMAP = self.__buildTypeMap ()
tables = self.__readTables (parent)
@@ -78,11 +78,11 @@
for rec in self.__iterateRS (rs):
(name, rtype) = [rec.get (i) for i in ['TABLE_NAME', 'TABLE_TYPE']]
- if not rtype in self._RELKIND:
+ if not rtype in self.__RELKIND:
continue
if not rtype in masters:
- masters [rtype] = GSchema.GSTables (parent, **self._RELKIND [rtype])
+ masters [rtype] = GSchema.GSTables (parent, **self.__RELKIND [rtype])
result [name] = GSchema.GSTable (masters [rtype], name = name)
Modified: trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/msado/adodbapidrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -125,13 +125,12 @@
Connection class for MS ADO backends using the adodbapi DBSIG2 module.
"""
- _drivername_ = 'adodbapi'
+ _drivername_ = 'adodbapi'
+ _defaultBehavior_ = Behavior.Behavior
_broken_rowcount_ = True
- _defaultBehavior_ = Behavior.Behavior
-
# ---------------------------------------------------------------------------
# Build up parameters for connect method
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for MySQL backends.
"""
+__all__ = ['Behavior']
+
import os
from gnue.common.datasources import GSchema
@@ -57,16 +59,16 @@
DBSIG2.Behavior.__init__ (self, *args, **kwargs)
- self._TYPEMAP = {'string' : ('string', 'string'),
- 'date' : ('date', 'date'),
- 'time' : ('date', 'time'),
- 'timestamp': ('date', 'timestamp'),
- 'datetime' : ('date', 'datetime')}
+ self.__TYPEMAP = {'string' : ('string', 'string'),
+ 'date' : ('date', 'date'),
+ 'time' : ('date', 'time'),
+ 'timestamp': ('date', 'timestamp'),
+ 'datetime' : ('date', 'datetime')}
# Update the typemap with numeric types
for t in ['int','integer','bigint','mediumint',
'smallint','tinyint','float','real', 'double','decimal']:
- self._TYPEMAP [t] = ('number', 'number')
+ self.__TYPEMAP [t] = ('number', 'number')
self._maxIdLength_ = 64
self._numbers_ = [[(4, 'smallint'), (9, 'int'), (18, 'bigint')],
@@ -189,8 +191,8 @@
'nullable' : null == 'YES',
'type' : 'string'}
- if nativetype [0] in self._TYPEMAP:
- (group, properties ['type']) = self._TYPEMAP [nativetype [0]]
+ if nativetype [0] in self.__TYPEMAP:
+ (group, properties ['type']) = self.__TYPEMAP [nativetype [0]]
else:
group = 'string'
@@ -342,6 +344,5 @@
if hasattr (field, 'defaultwith') and field.defaultwith == 'timestamp':
return "timestamp"
-
else:
return "datetime"
Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -44,13 +44,13 @@
Generic Connection class for Oracle databases.
"""
+ _behavior_ = Behavior.Behavior
+
# TODO: Test if it would work with the default (True/False), too
_boolean_false_ = 0
_boolean_true_ = 1
- _behavior_ = Behavior.Behavior
-
# ---------------------------------------------------------------------------
# Constructor
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/oracle/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/oracle/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -49,15 +49,15 @@
DBSIG2.Behavior.__init__ (self, *args, **kwargs)
- self._RELKIND = {
- 'user_table' : {'type': 'usertable', 'name': _("User Tables")},
- 'user_view' : {'type': 'userview', 'name': _("User Views")},
- 'user_synonym': {'type': 'usersynonym', 'name': _("User Synonyms")},
- 'all_table' : {'type': 'alltable', 'name': _('System Tables')},
- 'all_view' : {'type': 'allview', 'name': _('System Views')},
- 'all_synonym' : {'type': 'allsynonym', 'name': _('System Synonyms')}}
+ self.__RELKIND = {
+ 'user_table' : {'type': 'usertable', 'name': _("User Tables")},
+ 'user_view' : {'type': 'userview', 'name': _("User Views")},
+ 'user_synonym': {'type': 'usersynonym', 'name': _("User Synonyms")},
+ 'all_table' : {'type': 'alltable', 'name': _('System Tables')},
+ 'all_view' : {'type': 'allview', 'name': _('System Views')},
+ 'all_synonym' : {'type': 'allsynonym', 'name': _('System Synonyms')}}
+ self.__pkPrecision = 10
- self._pkPrecision = 10
self._maxIdLength_ = 31
self._alterMultiple_ = False
self._numbers_ = [[], "number (%s)", "number (%(length)s,%(scale)s)"]
@@ -100,7 +100,7 @@
try:
for (fullname, name, kind) in cursor.fetchall ():
if not kind in masters:
- masters [kind] = GSchema.GSTables (self._RELKIND [kind])
+ masters [kind] = GSchema.GSTables (self.__RELKIND [kind])
properties = {'id': fullname, 'name': name.lower (), 'kind': kind}
result [fullname] = GSchema.GSTable (masters [kind], **properties)
@@ -206,7 +206,7 @@
if field.defaultwith == 'serial':
seq = self._getSequenceName (field)
code [0].append (u"CREATE SEQUENCE %s MAXVALUE %s NOCYCLE" \
- % (seq, "9" * self._pkPrecision))
+ % (seq, "9" * self.__pkPrecision))
body = u"IF :new.%(field)s IS NULL THEN" \
" SELECT %(seq)s.nextval INTO :new.%(field)s FROM dual;" \
Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/oracle/cxoracledrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,7 +25,8 @@
Database driver plugin for Oracle backends using the cxOracle DBSIG2 module.
"""
-__all__ = ('Connection')
+__all__ = ['Connection']
+
__pluginalias__ = ['cxoracle']
from gnue.common.datasources.drivers.sql.oracle import Base
Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/oracle/dcoracledrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,7 +25,8 @@
Database driver plugin for Oracle backends using the DCOracle DBSIG2 module.
"""
-__all__ = ('Connection')
+__all__ = ['Connection']
+
__pluginalias__ = ['dcoracle']
from gnue.common.datasources.drivers.sql.oracle import Base
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -42,10 +42,10 @@
Generic Connection class for PostgreSQL backends.
"""
+ _behavior_ = Behavior.Behavior
+
_rowidField_ = 'oid'
- _behavior_ = Behavior.Behavior
-
# ---------------------------------------------------------------------------
# Constructor
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for PostgreSQL backends.
"""
+__all__ = ['Behavior']
+
import os
from gnue.common.apps import errors
@@ -49,29 +51,29 @@
DBSIG2.Behavior.__init__ (self, *args, **kwargs)
- self._RELKIND = {'v': {'type': 'view', 'name': _("Views")},
- 'r': {'type': 'table', 'name': _("Tables")}}
+ self.__RELKIND = {'v': {'type': 'view', 'name': _("Views")},
+ 'r': {'type': 'table', 'name': _("Tables")}}
- self._maxIdLength_ = 31
- self._alterMultiple_ = False
- self._numbers_ = [[(4, 'smallint'), (9, 'integer'), (18, 'bigint')],
- "numeric (%s,0)", "numeric (%(length)s,%(scale)s)"]
-
# Build typemap: {nativetype: (group, fieldtype)}
- self._TYPEMAP = {'date' : ('date', 'date'),
+ self.__TYPEMAP = {'date' : ('date', 'date'),
'bool' : ('boolean', 'boolean'),
'string': ('string', 'string')}
for item in ['numeric', 'float4', 'float8', 'money', 'int8',
'int2', 'int4', 'serial']:
- self._TYPEMAP [item] = ('number', 'number')
+ self.__TYPEMAP [item] = ('number', 'number')
for item in ['time', 'reltime']:
- self._TYPEMAP [item] = ('date', 'time')
+ self.__TYPEMAP [item] = ('date', 'time')
for item in ['timestamp', 'abstime']:
- self._TYPEMAP [item] = ('date', 'datetime')
+ self.__TYPEMAP [item] = ('date', 'datetime')
+ self._maxIdLength_ = 31
+ self._alterMultiple_ = False
+ self._numbers_ = [[(4, 'smallint'), (9, 'integer'), (18, 'bigint')],
+ "numeric (%s,0)", "numeric (%(length)s,%(scale)s)"]
+
self._type2native_.update ({'boolean' : 'boolean',
'datetime': 'timestamp without time zone'})
@@ -223,10 +225,10 @@
'nativetype': typename,
'nullable' : hasdef or not notnull}
- if typename.lower () in self._TYPEMAP:
- (group, attrs ['type']) = self._TYPEMAP [typename.lower ()]
+ if typename.lower () in self.__TYPEMAP:
+ (group, attrs ['type']) = self.__TYPEMAP [typename.lower ()]
else:
- (group, attrs ['type']) = self._TYPEMAP ['string']
+ (group, attrs ['type']) = self.__TYPEMAP ['string']
if group == 'number':
if typemod != -1:
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/psycopgdrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,7 +25,8 @@
Database driver plugin for PostgreSQL backends using the psycopg DBSIG2 module.
"""
-__all__ = ('Connection')
+__all__ = ['Connection']
+
__pluginalias__ = ['psycopg']
from gnue.common.datasources.drivers.sql.postgresql import Base
Modified:
trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/pygresqldrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -26,7 +26,8 @@
module.
"""
-__all__ = ('Connection')
+__all__ = ['Connection']
+
__pluginalias__ = ['pygresql']
from gnue.common.datasources.drivers.sql.postgresql import Base
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/pypgsqldrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,7 +25,8 @@
Database driver plugin for PostgreSQL backends using the pyPgSQL DBSIG2 module.
"""
-__all__ = ('Connection')
+__all__ = ['Connection']
+
__pluginalias__ = ['pypgsql']
from gnue.common.datasources.drivers.sql.postgresql import Base
@@ -102,6 +103,7 @@
"""
_drivername_ = 'pyPgSQL.PgSQL'
- _rowidField_ = None # PyPgSQL doesn't support rowid's!!
+
+ _rowidField_ = None # PyPgSQL doesn't support rowid's!!
_broken_fetchmany_ = True
- _broken_rowcount_ = True
+ _broken_rowcount_ = True
Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,6 +25,8 @@
Schema support plugin for SQLite.
"""
+__all__ = ['Behavior']
+
import re
from gnue.common.apps import errors
@@ -58,11 +60,17 @@
# =============================================================================
class MissingTableError (errors.AdminError):
+ """
+ Table should be altered but original table cannot be found.
+ """
def __init__ (self, table):
msg = u_("Cannot find table '%s' anymore") % table
errors.AdminError.__init__ (self, msg)
class InvalidSQLCommand (errors.SystemError):
+ """
+ SQL command used to create the table cannot be parsed.
+ """
def __init__ (self, sql):
msg = u_("Cannot split SQL command: '%s'") % sql
errors.SystemError.__init__ (self, msg)
@@ -93,6 +101,9 @@
DBSIG2.Behavior.__init__ (self, connection)
+ self.__RELTYPE = {'table': {'type': 'table', 'name': _("Tables")},
+ 'view' : {'type': 'view', 'name': _("Views")}}
+
self._maxIdLength_ = 31
self._alterMultiple_ = False
self._numbers_ = [[(None, 'integer')],
@@ -102,8 +113,6 @@
self._type2native_.update ({'boolean' : 'integer',
'datetime': 'timestamp'})
- self._RELTYPE = {'table': {'type': 'table', 'name': _("Tables")},
- 'view' : {'type': 'view', 'name': _("Views")}}
self._passThroughTypes = ['date', 'datetime', 'time']
@@ -149,12 +158,12 @@
try:
for (reltype, name, sql) in cursor.fetchall ():
- if not reltype in self._RELTYPE:
+ if not reltype in self.__RELTYPE:
continue
if not reltype in masters:
masters [reltype] = GSchema.GSTables (parent,
- **self._RELTYPE [reltype])
+ **self.__RELTYPE [reltype])
key = name.lower ()
result [key] = GSchema.GSTable (masters [reltype], name = name,
@@ -361,7 +370,7 @@
# Drop a given constraint
# ---------------------------------------------------------------------------
- def _dropConstraint (self, constraint):
+ def _dropConstraint_ (self, constraint):
"""
SQLite does not support referential constraints, so this function returns
an empty code-triple.
@@ -392,8 +401,6 @@
# ---------------------------------------------------------------------------
def _createTable_ (self, table):
- """
- """
# We need to know if the diff contains new fields. If not, we can use the
# DBSIG2 way for code-generation
Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/sqlite2/pysqlitedrv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,8 +25,7 @@
Database driver plugin for SQLite backends using the pysqlite DBSIG2 module.
"""
-__all__ = ['Connection']
-__pluginalias__ = ['sqlite2']
+__all__ = ['Connection']
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sql.sqlite2 import Behavior
Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite3/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/sqlite3/Behavior.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/sqlite3/Behavior.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -56,4 +56,5 @@
self._type2native_.update ({'boolean' : 'boolean',
'datetime': 'timestamp'})
+
self._passThroughTypes.append ('boolean')
Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py
2005-08-05 20:04:34 UTC (rev 7790)
+++ trunk/gnue-common/src/datasources/drivers/sql/sqlite3/pysqlite2drv.py
2005-08-06 19:14:11 UTC (rev 7791)
@@ -25,8 +25,7 @@
Database driver plugin for SQLite3 backends using the pysqlite2 DBSIG2 module.
"""
-__all__ = ['Connection']
-__pluginalias__ = ['sqlite3']
+__all__ = ['Connection']
import datetime
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7791 - in trunk/gnue-common/src/datasources/drivers: other sql/interbase sql/maxdb sql/msado sql/mysql sql/oracle sql/postgresql sql/sqlite2 sql/sqlite3,
reinhard <=