[gnue-contrib] r248 - in objectWrapper: . src tests tests/objects

[jamest]

Author: jamest
Date: 2006-11-14 08:58:20 -0600 (Tue, 14 Nov 2006)
New Revision: 248

Modified:
   objectWrapper/setup-svn
   objectWrapper/setup.py
   objectWrapper/src/ObjectWrapper.py
   objectWrapper/tests/basics.py
   objectWrapper/tests/joins.py
   objectWrapper/tests/objects/address.py
   objectWrapper/tests/objects/baseAddress.py
   objectWrapper/tests/objects/invoice.py
   objectWrapper/tests/objects/invoiceAddress.py
   objectWrapper/tests/objects/invoiceItem.py
   objectWrapper/tests/objects/item.py
   objectWrapper/tests/objects/state.py
   objectWrapper/tests/util_converters.py
Log:
added datasource's primarykeyseq support
syncs unit tests with install location


Modified: objectWrapper/setup-svn
===================================================================
--- objectWrapper/setup-svn     2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/setup-svn     2006-11-14 14:58:20 UTC (rev 248)
@@ -15,13 +15,13 @@
 ln -s -f `pwd`/src/* $TARGET
 if [ -d ../../gnue/.cvsdevelbase ]
   then
-    if [ ! -d ../../gnue/.cvsdevelbase/gnue/common/contrib ] 
+    if [ ! -d ../../gnue/.cvsdevelbase/gnue/contrib ] 
     then
-         mkdir -p ../../gnue/.cvsdevelbase/gnue/common/contrib
-         touch ../../gnue/.cvsdevelbase/gnue/common/contrib/__init__.py
+         mkdir -p ../../gnue/.cvsdevelbase/gnue/contrib
+         touch ../../gnue/.cvsdevelbase/gnue/contrib/__init__.py
     fi 
 
-    ln -s -f $TARGET 
`pwd`/../../gnue/.cvsdevelbase/gnue/common/contrib/objectWrapper
+    ln -s -f $TARGET `pwd`/../../gnue/.cvsdevelbase/gnue/contrib/objectWrapper
   else
     echo "Could not find gnue-common's setup-svn.py base"
   fi 

Modified: objectWrapper/setup.py
===================================================================
--- objectWrapper/setup.py      2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/setup.py      2006-11-14 14:58:20 UTC (rev 248)
@@ -15,7 +15,7 @@
   return result
 
 setup_params = {}
-setup_params['package_dir'] = { 'gnue.common.contrib.objectWrapper' : 'src',
+setup_params['package_dir'] = { 'gnue.contrib.objectWrapper' : 'src',
                               }
 packages = []
 for module, directory in setup_params["package_dir"].items ():

Modified: objectWrapper/src/ObjectWrapper.py
===================================================================
--- objectWrapper/src/ObjectWrapper.py  2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/src/ObjectWrapper.py  2006-11-14 14:58:20 UTC (rev 248)
@@ -14,11 +14,11 @@
 
 from gnue.common.apps import errors
 
-from gnue.common.contrib.objectWrapper.datasources import DBConnections
-from gnue.common.contrib.objectWrapper.datasources import DataSourceWrapper
-from gnue.common.contrib.objectWrapper.util.converters \
+from gnue.contrib.objectWrapper.datasources import DBConnections
+from gnue.contrib.objectWrapper.datasources import DataSourceWrapper
+from gnue.contrib.objectWrapper.util.converters \
   import convertValueToDecimal, convertMxDatetimeToDatetime, coalesce
-from gnue.common.contrib.objectWrapper.external.commonProperty import 
CommonProperty
+from gnue.contrib.objectWrapper.external.commonProperty import CommonProperty
 
 # ----------------------------------------------------------------------------
 # Exceptions
@@ -39,12 +39,17 @@
   """
   Base class to add simple load, post functions to the system.
   """
+  _connectionName = 'gnue' # The default GNUe connection name
+
   _tableName = None # The name of the db table to which this object 
                     # is associated
                           
   _primaryKeys = None # A common seperated list of primary key fields 
                       # used in the table
   
+  _primaryKeySeq = None # Name of sequence to be used to populate 
+                        # primary key field
+  
   _fieldMap  = {}   # The field map is a dictionary of 
                     # <table field name>:<instance variable name>
                     # pairs.
@@ -72,7 +77,6 @@
     self._recordSet = None # A handle to the record set that is associated
                            # with this instance via the load() function
                            
-    self._connectionName = 'gnue' # The default gnue connection name
 
     self.__datasourceAttributes = {        # The attributes that will be used 
        'connection': self._connectionName, # when setting up connections to 
@@ -81,6 +85,9 @@
                                 
     if self._primaryKeys is not None:
       self.__datasourceAttributes['primarykey'] = self._primaryKeys
+    
+    if self._primaryKeySeq is not None:
+      self.__datasourceAttributes['primarykeyseq'] = self._primaryKeySeq
 
       
     if connections is None:

Modified: objectWrapper/tests/basics.py
===================================================================
--- objectWrapper/tests/basics.py       2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/tests/basics.py       2006-11-14 14:58:20 UTC (rev 248)
@@ -11,7 +11,7 @@
 # from gnue.common.apps import GDebug
 # GDebug.setDebug ("3")
 
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, Join
 
 from objects.address import Address

Modified: objectWrapper/tests/joins.py
===================================================================
--- objectWrapper/tests/joins.py        2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/tests/joins.py        2006-11-14 14:58:20 UTC (rev 248)
@@ -15,7 +15,7 @@
 
 from gnue.common.external.decimal import Decimal
 
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, Join
   
 from objects.baseAddress import getCurrentAddress

Modified: objectWrapper/tests/objects/address.py
===================================================================
--- objectWrapper/tests/objects/address.py      2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/objects/address.py      2006-11-14 14:58:20 UTC (rev 
248)
@@ -6,10 +6,10 @@
 
 from datetime import datetime
 
-from gnue.common.contrib.objectWrapper.external.commonProperty \
+from gnue.contrib.objectWrapper.external.commonProperty \
   import CommonProperty
   
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, \
          _getDatetime, _setDatetime
 

Modified: objectWrapper/tests/objects/baseAddress.py
===================================================================
--- objectWrapper/tests/objects/baseAddress.py  2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/objects/baseAddress.py  2006-11-14 14:58:20 UTC (rev 
248)
@@ -8,10 +8,10 @@
 from datetime import datetime
 
 from gnue.common.apps import errors
-from gnue.common.contrib.objectWrapper.external.commonProperty \
+from gnue.contrib.objectWrapper.external.commonProperty \
   import CommonProperty
   
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, Join, \
          _getDatetime, _setDatetime
 

Modified: objectWrapper/tests/objects/invoice.py
===================================================================
--- objectWrapper/tests/objects/invoice.py      2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/objects/invoice.py      2006-11-14 14:58:20 UTC (rev 
248)
@@ -10,10 +10,10 @@
 from objects.invoiceAddress  import InvoiceAddress
 from objects.invoiceItem     import InvoiceItem
 
-from gnue.common.contrib.objectWrapper.external.commonProperty \
+from gnue.contrib.objectWrapper.external.commonProperty \
   import CommonProperty
 
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, Join, \
          _getDatetime, _setDatetime, _getDecimal, _setDecimal
 

Modified: objectWrapper/tests/objects/invoiceAddress.py
===================================================================
--- objectWrapper/tests/objects/invoiceAddress.py       2006-10-25 08:03:42 UTC 
(rev 247)
+++ objectWrapper/tests/objects/invoiceAddress.py       2006-11-14 14:58:20 UTC 
(rev 248)
@@ -5,7 +5,7 @@
 __revision__ = "$Id$"
 
 from objects.baseAddress import BaseAddress
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import Field
 
 # ============================================================================

Modified: objectWrapper/tests/objects/invoiceItem.py
===================================================================
--- objectWrapper/tests/objects/invoiceItem.py  2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/objects/invoiceItem.py  2006-11-14 14:58:20 UTC (rev 
248)
@@ -6,9 +6,9 @@
 
 from gnue.common.external.decimal import Decimal, ROUND_HALF_UP
 
-from gnue.common.contrib.objectWrapper.external.commonProperty \
+from gnue.contrib.objectWrapper.external.commonProperty \
   import CommonProperty
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, \
          _getDecimal, _setDecimal
 

Modified: objectWrapper/tests/objects/item.py
===================================================================
--- objectWrapper/tests/objects/item.py 2006-10-25 08:03:42 UTC (rev 247)
+++ objectWrapper/tests/objects/item.py 2006-11-14 14:58:20 UTC (rev 248)
@@ -7,10 +7,10 @@
 
 from gnue.common.external.decimal import Decimal
 
-from gnue.common.contrib.objectWrapper.external.commonProperty \
+from gnue.contrib.objectWrapper.external.commonProperty \
   import CommonProperty
   
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field, \
          _getDecimal, _setDecimal, \
          _getDatetime, _setDatetime

Modified: objectWrapper/tests/objects/state.py
===================================================================
--- objectWrapper/tests/objects/state.py        2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/objects/state.py        2006-11-14 14:58:20 UTC (rev 
248)
@@ -3,7 +3,7 @@
 """
 __revision__ = "$Id: state.py 731 2006-02-16 18:02:02Z jamest $"
 
-from gnue.common.contrib.objectWrapper.ObjectWrapper \
+from gnue.contrib.objectWrapper.ObjectWrapper \
   import ObjectWrapper, Field
 
 # ============================================================================

Modified: objectWrapper/tests/util_converters.py
===================================================================
--- objectWrapper/tests/util_converters.py      2006-10-25 08:03:42 UTC (rev 
247)
+++ objectWrapper/tests/util_converters.py      2006-11-14 14:58:20 UTC (rev 
248)
@@ -18,7 +18,7 @@
 from gnue.common.external.fixedpoint import FixedPoint
 from gnue.common.external.decimal import Decimal
 
-from gnue.common.contrib.objectWrapper.util.converters \
+from gnue.contrib.objectWrapper.util.converters \
   import convertValueToDecimal, convertMxDatetimeToDatetime, \
          coalesce