r5178 - trunk/gnue-appserver/src/classrep

[reinhard]

Author: reinhard
Date: 2004-02-27 09:58:29 -0600 (Fri, 27 Feb 2004)
New Revision: 5178

Modified:
   trunk/gnue-appserver/src/classrep/SchemaSupport.py
Log:
Be more consequent about using table/column instead of fullName.


Modified: trunk/gnue-appserver/src/classrep/SchemaSupport.py
===================================================================
--- trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-02-27 14:32:30 UTC 
(rev 5177)
+++ trunk/gnue-appserver/src/classrep/SchemaSupport.py  2004-02-27 15:58:29 UTC 
(rev 5178)
@@ -84,20 +84,20 @@
 
     # If no specific items are requested, we will use classes
     if items is None or len (items) == 0:
-      tableList = self.__classes.keys ()
+      classList = self.__classes.keys ()
 
-    # otherwise check all items and create the tablelist
+    # otherwise check all items and create the classlist
     else:
-      tableList = []
+      classList = []
 
       for item in items:
         # if item is a module add all it's classes to the list
         if Namespace.getNamespaceId (item) == Namespace.NSID_MODULE:
-          tableList.extend (self.__modules [item].classes.keys ())
+          classList.extend (self.__modules [item].classes.keys ())
 
         # if item is a class add it to the list
         elif Namespace.getNamespaceId (item) == Namespace.NSID_CLASS:
-          tableList.append (item)
+          classList.append (item)
 
         # otherwise item is of no use to us
         else:
@@ -112,13 +112,13 @@
 
     # Schema-Definition
     if wtype.lower () in ["both", "schema"]:
-      for table in tableList:
-        self.__createTableDef (gsTables, table)
+      for classname in classList:
+        self.__createTableDef (gsTables, self.__classes [classname])
 
     # Data
     if wtype.lower () in ["both", "data"]:
       gsData = GSData (schema)
-      self.__createDataList (gsData, tableList)
+      self.__createDataList (gsData, classList)
 
     if filename is None:
       dest = sys.stdout
@@ -135,25 +135,24 @@
 
 
   # ---------------------------------------------------------------------------
-  # Create the tabledefinition for tablename
+  # Create the tabledefinition for classname
   # ---------------------------------------------------------------------------
-  def __createTableDef (self, gsTables, tablename):
+  def __createTableDef (self, gsTables, classdef):
+
     table      = GSTable (gsTables)
-    table.name = unicode (tablename, "utf-8")
+    table.name = unicode (classdef.table, "utf-8")
 
     # add fields listing (required)
     fields = GSFields (table)
     GSConstraints (table)
     GSIndexes (table)
       
-    aClass = self.__classes [tablename]
-    for cProp in aClass.properties.values ():
+    for cProp in classdef.properties.values ():
       field = GSField (fields)
-      field.name        = unicode (cProp.fullName, "utf-8")
+      field.name        = unicode (cProp.column, "utf-8")
       field.description = unicode (cProp.gnue_comment, "utf-8")
-
-      field.type      = unicode (cProp.dbType, "utf-8")
-      field.precision = int (cProp.dbScale)
+      field.type        = unicode (cProp.dbType, "utf-8")
+      field.precision   = int (cProp.dbScale)
       if int (cProp.dbLength) > 0:
         field.length = int (cProp.dbLength)
       if field.name == "gnue_id":
@@ -161,10 +160,10 @@
 
     # If there is a property 'gnue_id' of type 'id' in a class use it for the
     # primary key
-    if aClass.properties.has_key ("gnue_id"):
-      if aClass.properties ["gnue_id"].gnue_type == "id":
+    if classdef.properties.has_key ("gnue_id"):
+      if classdef.properties ["gnue_id"].gnue_type == "id":
         pk = GSPrimaryKey (table)
-        pk.name = "gnue_id_pk_%s" % unicode (aClass.fullName, "utf-8")
+        pk.name = "gnue_id_pk_%s" % unicode (classdef.table, "utf-8")
 
         pkf = GSPKField (pk)
         pkf.name = 'gnue_id'
@@ -173,26 +172,26 @@
   # ---------------------------------------------------------------------------
   # Dump all tabledata from a given tablelist
   # ---------------------------------------------------------------------------
-  def __createDataList (self, gsData, tableList):
-    # first we need a list of all modules used in tableList
+  def __createDataList (self, gsData, classList):
+    # first we need a list of all modules used in classList
     modules = {}
-    for table in tableList:
-      modules [Namespace.splitName (table) [0]] = 1
+    for classname in classList:
+      m = self.__classes[classname].module
+      modules [m.fullName] = m
 
-    # dump one row from gnue_module for all items in modules 
+    # dump one row from gnue_module for all items in modules
     moddata = GSTableData (gsData)
     moddata.name      = 'gnue_module_dump'
     moddata.tablename = 'gnue_module'
     modrows = GSRows (moddata)
 
-    for module in modules.keys ():
-      mDef  = self.__modules [module]
+    for moduledef in modules.values ():
       mProp = self.__classes ["gnue_module"].properties
       row   = GSRow (modrows)
 
-      self.__buildValue (row, mProp ["gnue_id"], mDef.gnue_id)
-      self.__buildValue (row, mProp ["gnue_name"], mDef.gnue_name)
-      self.__buildValue (row, mProp ["gnue_comment"], mDef.gnue_comment)
+      self.__buildValue (row, mProp ["gnue_id"], moduledef.gnue_id)
+      self.__buildValue (row, mProp ["gnue_name"], moduledef.gnue_name)
+      self.__buildValue (row, mProp ["gnue_comment"], moduledef.gnue_comment)
 
     # dump all gnue_class rows for the requested tables
     tabledata = GSTableData (gsData)
@@ -206,39 +205,39 @@
     propdata.tablename = 'gnue_property'
     proprows = GSRows (propdata)
 
-    for tablename in tableList:
-      cDef  = self.__classes [tablename]
+    for classname in classList:
+      classdef = self.__classes [classname]
       cProp = self.__classes ["gnue_class"].properties
           
       # save tabledata
       row = GSRow (tablerows)              
 
-      self.__buildValue (row, cProp ["gnue_id"], cDef.gnue_id)
-      self.__buildValue (row, cProp ["gnue_module"], cDef.gnue_module)
-      self.__buildValue (row, cProp ["gnue_name"], cDef.gnue_name)
-      self.__buildValue (row, cProp ["gnue_comment"], cDef.gnue_comment)
-      
-      for curProp in cDef.properties.values ():
+      self.__buildValue (row, cProp ["gnue_id"], classdef.gnue_id)
+      self.__buildValue (row, cProp ["gnue_module"], classdef.gnue_module)
+      self.__buildValue (row, cProp ["gnue_name"], classdef.gnue_name)
+      self.__buildValue (row, cProp ["gnue_comment"], classdef.gnue_comment)
+
+      for propdef in classdef.properties.values ():
         # add one field per property
         pProp = self.__classes ["gnue_property"].properties
-        row = GSRow (proprows)                           
+        row = GSRow (proprows)
 
-        self.__buildValue (row, pProp ["gnue_id"], curProp.gnue_id)
-        self.__buildValue (row, pProp ["gnue_module"], curProp.gnue_module)
-        self.__buildValue (row, pProp ["gnue_class"], curProp.gnue_class)
-        self.__buildValue (row, pProp ["gnue_name"], curProp.gnue_name)
-        self.__buildValue (row, pProp ["gnue_type"], curProp.gnue_type)
-        self.__buildValue (row, pProp ["gnue_length"], curProp.gnue_length)
-        self.__buildValue (row, pProp ["gnue_scale"], curProp.gnue_scale)
-        self.__buildValue (row, pProp ["gnue_comment"], curProp.gnue_comment)
-                  
+        self.__buildValue (row, pProp ["gnue_id"], propdef.gnue_id)
+        self.__buildValue (row, pProp ["gnue_module"], propdef.gnue_module)
+        self.__buildValue (row, pProp ["gnue_class"], propdef.gnue_class)
+        self.__buildValue (row, pProp ["gnue_name"], propdef.gnue_name)
+        self.__buildValue (row, pProp ["gnue_type"], propdef.gnue_type)
+        self.__buildValue (row, pProp ["gnue_length"], propdef.gnue_length)
+        self.__buildValue (row, pProp ["gnue_scale"], propdef.gnue_scale)
+        self.__buildValue (row, pProp ["gnue_comment"], propdef.gnue_comment)
 
+
   # ---------------------------------------------------------------------------
   # Create a new field in a row and populate it with a value
   # ---------------------------------------------------------------------------
   def __buildValue (self, row, prop, data):
     value = GSValue (row)
-    value.field = prop.fullName
+    value.field = prop.column
     value.type  = prop.dbFullType
     GContent (value, 
       unicode (self.__nativeToString (data, prop.dbFullType), 'utf-8'))