[gnue] r7195 - in trunk/gnue-common/src: datasources schema

[johannes]

Author: johannes
Date: 2005-03-13 04:43:25 -0600 (Sun, 13 Mar 2005)
New Revision: 7195

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/schema/GSData.py
Log:
Also allow types 'number(5,2)', not only 'number(5.2)' in gsd files, and
(temp.) deactivated addition of _primaryIdField to the fieldReferences (since
it breaks joins in appserver)


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-03-13 10:41:15 UTC 
(rev 7194)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-03-13 10:43:25 UTC 
(rev 7195)
@@ -275,8 +275,10 @@
       pass
 
     # Make sure the primary key is included in the field references
-    if dataObject._primaryIdField:
-      self._fieldReferences [dataObject._primaryIdField] = True
+    # FIXME: reinhard, please check if the following lines are really needed,
+    # since they break joins in appserver
+    #if dataObject._primaryIdField:
+      #self._fieldReferences [dataObject._primaryIdField] = True
 
     hasRaw = False
     for child in self._children:

Modified: trunk/gnue-common/src/schema/GSData.py
===================================================================
--- trunk/gnue-common/src/schema/GSData.py      2005-03-13 10:41:15 UTC (rev 
7194)
+++ trunk/gnue-common/src/schema/GSData.py      2005-03-13 10:43:25 UTC (rev 
7195)
@@ -30,7 +30,7 @@
 # Constants
 # =============================================================================
 
-_LENGTH_SCALE = re.compile ('^\w+\s*\((\d+)[\.]{0,1}(\d*)\)\s*')
+_LENGTH_SCALE = re.compile ('^\w+\s*\((\d+)[\.,]{0,1}(\d*)\)\s*')
 _VALID_TYPES  = ["string", "number", "boolean", "date", "time", "datetime"]
 _TRANS_TYPES  = { "text": "string",
                   "timestamp": "datetime" }