[Zapp-cvs-commit] ZApp/leverMethods/PG insertItemLever.plain,1.12,1.13 updateItemLever.plain,1.8,1.9

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp/leverMethods/PG
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27407/leverMethods/PG

Modified Files:
	insertItemLever.plain updateItemLever.plain 
Log Message:
add 'size' safety to insert/update queries.

Index: insertItemLever.plain
===================================================================
RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/insertItemLever.plain,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** insertItemLever.plain	8 Jan 2004 22:24:43 -0000	1.12
--- insertItemLever.plain	10 Mar 2004 18:30:50 -0000	1.13
***************
*** 16,19 ****
--- 16,20 ----
  primaryKey = specialist.getPrimaryKey()
  refLookup = specialist.ZApp_getReferenceLookup()
+ defaultSize = specialist.ZApp_getDefaultStringSize()
  
  typeLookups = {
***************
*** 48,56 ****
              itemList.append(fmtString)
          else:
              refList = refLookup.get(itemID,[])
              if len(refList) >= 2:
!                 itemList.append('<dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, itemID, theType))
              else:
!                 itemList.append('<dtml-sqlvar %s  type="%s">' % (itemID, theType))
  
  templateString = templateString % (specialist.id, string.join(columnList, ',\n'), string.join(itemList,',\n'))
--- 49,62 ----
              itemList.append(fmtString)
          else:
+             if theType == 'string':
+                 theSize = item.get('dbSize',item.get('sqlSize',defaultSize))
+                 theVal = ('"%s[0:%i]"' % (itemID, theSize))
+             else:
+                 theVal = itemID
              refList = refLookup.get(itemID,[])
              if len(refList) >= 2:
!                 itemList.append('<dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, theVal, theType))
              else:
!                 itemList.append('<dtml-sqlvar %s  type="%s">' % (theVal, theType))
  
  templateString = templateString % (specialist.id, string.join(columnList, ',\n'), string.join(itemList,',\n'))

Index: updateItemLever.plain
===================================================================
RCS file: /cvsroot/zapp/ZApp/leverMethods/PG/updateItemLever.plain,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** updateItemLever.plain	8 Jan 2004 22:24:43 -0000	1.8
--- updateItemLever.plain	10 Mar 2004 18:30:50 -0000	1.9
***************
*** 16,19 ****
--- 16,20 ----
  primaryKey = specialist.getPrimaryKey()
  refLookup = specialist.ZApp_getReferenceLookup()
+ defaultSize = specialist.ZApp_getDefaultStringSize()
  
  typeLookups = {
***************
*** 53,61 ****
              else:
                  theType = typeLookups.get(dbType, dbType)
                  refList = refLookup.get(itemID,[])
                  if len(refList) >= 2:
!                     itemString = '%s = <dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, itemID, itemID, theType)
                  else:
!                     itemString = '%s = <dtml-sqlvar %s  type="%s">' % (itemID, itemID, theType)
  
          itemList.append( itemString )
--- 54,67 ----
              else:
                  theType = typeLookups.get(dbType, dbType)
+                 if theType == 'string':
+                     theSize = item.get('dbSize',item.get('sqlSize',defaultSize))
+                     theVal = ('"%s[0:%i]"' % (itemID, theSize))
+                 else:
+                     theVal = itemID
                  refList = refLookup.get(itemID,[])
                  if len(refList) >= 2:
!                     itemString = '%s = <dtml-if %s><dtml-sqlvar %s  type="%s"><dtml-else>NULL</dtml-if>' % (itemID, itemID, theVal, theType)
                  else:
!                     itemString = '%s = <dtml-sqlvar %s  type="%s">' % (itemID, theVal, theType)
  
          itemList.append( itemString )