Author: reinhard
Date: 2005-04-19 17:41:03 -0500 (Tue, 19 Apr 2005)
New Revision: 7427
Modified:
trunk/gnue-common/src/datasources/GDataSource.py
Log:
Cleanup.
Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py 2005-04-19 22:25:59 UTC
(rev 7426)
+++ trunk/gnue-common/src/datasources/GDataSource.py 2005-04-19 22:41:03 UTC
(rev 7427)
@@ -58,11 +58,7 @@
self._connections = None
self._connection = None # GConnection object
self._dataObject = None
- self._connectionComment = ""
- self._hasFieldReferences = False # True if any fields are referenced,
- # otherwise a "SELECT *" will be used
self._fieldReferences = {}
- self._unboundFieldReferences = {}
self._defaultData = {}
self._rowidField = None
self._primarykeyFields = []
@@ -415,7 +411,6 @@
return
gDebug (7, 'Field %s implicitly referenced' % field)
- self._hasFieldReferences = True
self._fieldReferences[field] = ""
if defaultValue != None:
@@ -442,7 +437,6 @@
def referenceUnboundField(self, field, defaultValue=None):
gDebug (7,'Unbound Field %s implicitly referenced' % field)
- self._unboundFieldReferences[field] = True
if defaultValue != None:
self._defaultData [field] = defaultValue
@@ -687,12 +681,20 @@
# =============================================================================
class GCSortOrder (GObjects.GObj):
+
+ # ---------------------------------------------------------------------------
+ # Constructor
+ # ---------------------------------------------------------------------------
+
def __init__ (self, parent = None):
- GObjects.GObj.__init__ (self, parent, 'GCSortOrder')
+ GObjects.GObj.__init__ (self, parent, type = 'GCSortOrder')
+
+ # ---------------------------------------------------------------------------
+ # Build Object
+ # ---------------------------------------------------------------------------
+
+ def _buildObject (self):
self.sorting = []
- self._inits = [self._build]
-
- def _build (self):
for item in self.findChildrenOfType ('GCSortField'):
self.sorting.append ({'name': item.name,
'descending': item.descending,
@@ -705,16 +707,16 @@
class GCSortField (GObjects.GObj):
def __init__ (self, parent = None):
- GObjects.GObj.__init__ (self, parent, 'GCSortField')
+ GObjects.GObj.__init__ (self, parent, type = 'GCSortField')
# =============================================================================
# <sql>
# =============================================================================
-class GSql(GObjects.GObj):
- def __init__(self, parent=None):
- GObjects.GObj.__init__(self, parent, type="GDSql")
+class GSql (GObjects.GObj):
+ def __init__ (self, parent = None):
+ GObjects.GObj.__init__ (self, parent, type = 'GDSql')
# =============================================================================
_______________________________________________
Commit-gnue mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnue
