[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r7340 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 adod
|
From: |
reinhard |
|
Subject: |
[gnue] r7340 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 adodbapi/adodbapi interbase/interbase mysql/mysql oracle/Base postgresql/Base sapdb/sapdb sqlite/sqlite |
|
Date: |
Tue, 12 Apr 2005 02:17:29 -0500 (CDT) |
Author: reinhard
Date: 2005-04-12 02:17:27 -0500 (Tue, 12 Apr 2005)
New Revision: 7340
Removed:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
trunk/gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py
trunk/gnue-common/src/datasources/drivers/oracle/Base/DataObject.py
trunk/gnue-common/src/datasources/drivers/postgresql/Base/DataObject.py
trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py
Modified:
trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
trunk/gnue-common/src/datasources/drivers/oracle/Base/Connection.py
trunk/gnue-common/src/datasources/drivers/oracle/Base/__init__.py
trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
trunk/gnue-common/src/datasources/drivers/postgresql/Base/__init__.py
trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
Log:
Removed unnecessary descendants of DataObject.
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -33,6 +33,9 @@
from gnue.common.datasources import Exceptions
from gnue.common.datasources.drivers import Base
+import DataObject
+
+
# =============================================================================
# Generic DBSIG2 connection class
# =============================================================================
@@ -60,6 +63,9 @@
sequence (True) or as mapping (False). Can be overwritten by descendants.
"""
+ supportedDataObjects = {'object': DataObject.DataObject_Object,
+ 'sql': DataObject.DataObject_SQL}
+
_driver = None # DBSIG2 compatible driver module
_boolean_false = False # value to pass for boolean FALSE
_boolean_true = True # value to pass for boolean TRUE
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -35,34 +35,15 @@
__all__ = ['DataObject','DataObject_SQL','DataObject_Object']
-from gnue.common.datasources.drivers.Base import DataObject as BaseDataObject
+from gnue.common.datasources.drivers import Base
+
from ResultSet import ResultSet
-######################################################################
-#
-#
-#
-class DataObject(BaseDataObject):
-
- _escapeSingleQuote = "'"
+class DataObject (Base.DataObject):
_resultSetClass = ResultSet
- # The date/time format used in insert/select statements
- # (based on format used for time.strftime())
- _dateTimeFormat = "'%c'"
- _timeFormat = "'%X'"
-
-
-######################################################################
-#
-#
-#
class DataObject_Object (DataObject):
pass
-######################################################################
-#
-#
-#
class DataObject_SQL (DataObject):
pass
Modified:
trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -61,8 +61,6 @@
defaultBehavior = Introspection
- supportedDataObjects = {'object': DBSIG2.DataObject_Object,
- 'sql': DBSIG2.DataObject_SQL}
# ---------------------------------------------------------------------------
# Build up parameters for connect method
Modified:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -34,9 +34,7 @@
from gnue.common.datasources.drivers.interbase.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.interbase.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# Interbase Connection class
# =============================================================================
@@ -53,10 +51,7 @@
defaultBehavior = Introspection
defaultCreator = Creation
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
-
# ---------------------------------------------------------------------------
# Constructor
# ---------------------------------------------------------------------------
Deleted:
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,46 +0,0 @@
-
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# interbase/DBdriver.py
-#
-# DESCRIPTION:
-# Driver to provide access to data via the Kinterbasdb Interbase/Firebird
Python Driver
-# Requires Kinterbasdb > 3.0 (http://kinterbasdb.sourceforge.net/)
-#
-# NOTES:
-
-__all__ = ['DataObject_SQL','DataObject_Object']
-
-
-from gnue.common.datasources.drivers import DBSIG2
-
-
-class _Base (DBSIG2.DataObject):
- # The date/time format used in insert/select statements
- # (based on format used for time.strftime())
- _dateTimeFormat = "cast('%Y-%m-%d %H:%M:%S' as timestamp)"
-
-class DataObject_Object (_Base, DBSIG2.DataObject_Object):
- pass
-
-class DataObject_SQL (_Base, DBSIG2.DataObject_SQL):
- pass
Modified: trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -35,9 +35,7 @@
from gnue.common.datasources.drivers.mysql.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.mysql.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# MySQL Connection class
# =============================================================================
@@ -52,8 +50,6 @@
defaultBehavior = Introspection
defaultCreator = Creation
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
# ---------------------------------------------------------------------------
# Get connection parameters
Deleted: trunk/gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/mysql/mysql/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,47 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# mysql/DBdriver.py
-#
-# DESCRIPTION:
-# Driver to provide access to data vi MySQL
-#
-# NOTES:
-# Supports transactions if the MySQL server is compiled w/transaction support
-# (which it does NOT by default)
-
-
-__all__ = ['DataObject_SQL','DataObject_Object']
-
-
-from gnue.common.datasources.drivers import DBSIG2
-
-class _Base:
- _escapeSingleQuote = '\\'
- _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
-
-class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
- pass
-
-class DataObject_Object(_Base, DBSIG2.DataObject_Object):
- pass
-
-
Modified: trunk/gnue-common/src/datasources/drivers/oracle/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/Base/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/oracle/Base/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -27,9 +27,7 @@
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.oracle.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# Generic Oracle Connection class
# =============================================================================
@@ -45,10 +43,7 @@
defaultBehavior = Introspection
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
-
# ---------------------------------------------------------------------------
# Constructor
# ---------------------------------------------------------------------------
Deleted: trunk/gnue-common/src/datasources/drivers/oracle/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/Base/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/oracle/Base/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,46 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# Oracle/Base/DataObject.py
-#
-# DESCRIPTION:
-#
-# NOTES:
-#
-# Supported attributes (via connections.conf or <database> tag)
-#
-# service= This is the Oracle TNS name for your connection (required)
-#
-
-__all__ = ['DataObject_SQL','DataObject_Object']
-
-
-from gnue.common.datasources.drivers import DBSIG2
-
-class _Base:
- _escapeSingleQuote = '\'\''
- _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
-
-class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
- pass
-
-class DataObject_Object(_Base, DBSIG2.DataObject_Object):
- pass
Modified: trunk/gnue-common/src/datasources/drivers/oracle/Base/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/oracle/Base/__init__.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/oracle/Base/__init__.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -23,4 +23,3 @@
__noplugin__ = True
from Connection import *
-from DataObject import *
Modified:
trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Base/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -27,9 +27,7 @@
from gnue.common.datasources.drivers.postgresql.Schema.Creation.Creation
import Creation
from gnue.common.datasources.drivers.postgresql.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# Generic PostgreSQL Connection class
# =============================================================================
@@ -42,9 +40,6 @@
defaultBehavior = Introspection
defaultCreator = Creation
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
-
_rowidField = 'oid'
Deleted: trunk/gnue-common/src/datasources/drivers/postgresql/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Base/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Base/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,45 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or(at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# FILE:
-# _pgsql/DBdriver.py
-#
-# DESCRIPTION:
-# A core Postgresql dbdriver that the other (specific)
-# postgresql drivers can extend
-#
-# NOTES:
-#
-
-__all__ = ['DataObject_SQL','DataObject_Object']
-
-
-from gnue.common.datasources.drivers import DBSIG2
-
-class _Base:
- _escapeSingleQuote = '\\'
- _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
-
-class DataObject_SQL(_Base, DBSIG2.DataObject_SQL):
- pass
-
-class DataObject_Object(_Base, DBSIG2.DataObject_Object):
- pass
-
Modified: trunk/gnue-common/src/datasources/drivers/postgresql/Base/__init__.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/Base/__init__.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/Base/__init__.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -23,5 +23,3 @@
__noplugin__ = True
from Connection import *
-from DataObject import *
-
Modified: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -34,9 +34,7 @@
from gnue.common.datasources.drivers.sapdb.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.sapdb.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# MaxDB/SAP-DB Connection class
# =============================================================================
@@ -53,10 +51,7 @@
defaultBehavior = Introspection
defaultCreator = Creation
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
-
# ---------------------------------------------------------------------------
# Get connection parameters
# ---------------------------------------------------------------------------
Deleted: trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/sapdb/sapdb/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,37 +0,0 @@
-# GNU Enterprise Common - Database Drivers - MaxDB/SAP-DB Driver
-#
-# Copyright 2001-2005 Free Software Foundation
-#
-# This file is part of GNU Enterprise
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# $Id$
-
-__all__ = ['DataObject_SQL', 'DataObject_Object']
-
-from gnue.common.datasources.drivers import DBSIG2
-
-class _Base:
- _escapeSingleQuote = "'"
- _dateTimeFormat = "'%Y-%m-%d %H:%M:%S'"
-
-class DataObject_SQL (_Base, DBSIG2.DataObject_SQL):
- pass
-
-class DataObject_Object (_Base, DBSIG2.DataObject_Object):
- pass
-
Modified: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/Connection.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -48,9 +48,7 @@
from gnue.common.datasources.drivers.sqlite.Schema.Creation.Creation import
Creation
from gnue.common.datasources.drivers.sqlite.Schema.Discovery.Introspection
import Introspection
-import DataObject
-
# =============================================================================
# SQLite Connection class
# =============================================================================
@@ -59,17 +57,14 @@
_driver = sqlite
- # TODO: test if the new default (True/False) would work, too
+ # SQLite doesn't like boolean type in SQL parameters
_boolean_true = 1
_boolean_false = 0
defaultBehavior = Introspection
defaultCreator = Creation
- supportedDataObjects = {'object': DataObject.DataObject_Object,
- 'sql': DataObject.DataObject_SQL}
-
# ---------------------------------------------------------------------------
# Constructor
# ---------------------------------------------------------------------------
Deleted: trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py
2005-04-12 06:31:52 UTC (rev 7339)
+++ trunk/gnue-common/src/datasources/drivers/sqlite/sqlite/DataObject.py
2005-04-12 07:17:27 UTC (rev 7340)
@@ -1,36 +0,0 @@
-#
-# This file is part of GNU Enterprise.
-#
-# GNU Enterprise is free software; you can redistribute it
-# and/or modify it under the terms of the GNU General Public
-# License as published by the Free Software Foundation; either
-# version 2, or (at your option) any later version.
-#
-# GNU Enterprise is distributed in the hope that it will be
-# useful, but WITHOUT ANY WARRANTY; without even the implied
-# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with program; see the file COPYING. If not,
-# write to the Free Software Foundation, Inc., 59 Temple Place
-# - Suite 330, Boston, MA 02111-1307, USA.
-#
-# Copyright 2000-2005 Free Software Foundation
-#
-# $Id$
-
-__all__ = ['DataObject_SQL', 'DataObject_Object']
-
-from gnue.common.datasources.drivers import DBSIG2
-
-
-class _Base:
- _dateTimeFormat = "'%Y-%m-%d %H:%M:%S.00'"
-
-class DataObject_SQL (_Base, DBSIG2.DataObject_SQL):
- pass
-
-class DataObject_Object (_Base, DBSIG2.DataObject_Object):
- pass
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r7340 - in trunk/gnue-common/src/datasources/drivers: DBSIG2 adodbapi/adodbapi interbase/interbase mysql/mysql oracle/Base postgresql/Base sapdb/sapdb sqlite/sqlite,
reinhard <=