Webware for Python

Update of /cvsroot/webware/Webware/MiddleKit/Run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17967/Run

Modified Files:
	SQLObjectStore.py 
Log Message:
- change the default primary key serial number column name to 'serialNum'
- added a new setting, SQLSerialColumnName, that controls that


Index: SQLObjectStore.py
===================================================================
RCS file: /cvsroot/webware/Webware/MiddleKit/Run/SQLObjectStore.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** SQLObjectStore.py	28 Feb 2004 03:13:09 -0000	1.61
--- SQLObjectStore.py	1 Mar 2004 01:44:34 -0000	1.62
***************
*** 55,61 ****
  		assert sourceKlass
  		sourceTableName = sourceKlass.sqlTableName()
! 		sourceSqlIdName = sourceKlass.sqlIdName()
  		return 'update %s set %s where %s=%s;' % (
! 			sourceTableName, self.sourceAttr.sqlUpdateExpr(self.targetObject), sourceSqlIdName, self.sourceObject.serialNum())
  
  	def __repr__(self):
--- 55,61 ----
  		assert sourceKlass
  		sourceTableName = sourceKlass.sqlTableName()
! 		sourceSqlSerialName = sourceKlass.sqlSerialColumnName()
  		return 'update %s set %s where %s=%s;' % (
! 			sourceTableName, self.sourceAttr.sqlUpdateExpr(self.targetObject), sourceSqlSerialName, self.sourceObject.serialNum())
  
  	def __repr__(self):
***************
*** 293,297 ****
  			className = klass.name()
  			if serialNum is not None:
! 				clauses = 'where %s=%d' % (klass.sqlIdName(), serialNum)
  			if self._markDeletes:
  				clauses = self.addDeletedToClauses(clauses)
--- 293,297 ----
  			className = klass.name()
  			if serialNum is not None:
! 				clauses = 'where %s=%d' % (klass.sqlSerialColumnName(), serialNum)
  			if self._markDeletes:
  				clauses = self.addDeletedToClauses(clauses)
***************
*** 452,456 ****
  				return obj
  
! 			clauses = 'where %s=%d' % (klass.sqlIdName(), serialNum)
  			objs = self.fetchObjectsOfClass(klass, clauses, isDeep=0)
  			if len(objs)==1:
--- 452,456 ----
  				return obj
  
! 			clauses = 'where %s=%d' % (klass.sqlSerialColumnName(), serialNum)
  			objs = self.fetchObjectsOfClass(klass, clauses, isDeep=0)
  			if len(objs)==1:
***************
*** 515,519 ****
  			attrs = [ attr for attr in klass.allAttrs() if attr.hasSQLColumn() ]
  			colNames = [ attr.name() for attr in attrs ]
! 			colNames.insert(0, klass.sqlIdName())
  			out.write(CSVJoiner.joinCSVFields(colNames) + "\n")
  
--- 515,519 ----
  			attrs = [ attr for attr in klass.allAttrs() if attr.hasSQLColumn() ]
  			colNames = [ attr.name() for attr in attrs ]
! 			colNames.insert(0, klass.sqlSerialColumnName())
  			out.write(CSVJoiner.joinCSVFields(colNames) + "\n")
  
***************
*** 609,613 ****
  			res.append(attr.sqlUpdateExpr(self.valueForAttr(attr)))
  		res = ','.join(res)
! 		res = ('update ', klass.sqlTableName(), ' set ', res, ' where ', klass.sqlIdName(), '=', str(self.serialNum()))
  		return ''.join(res)
  
--- 609,613 ----
  			res.append(attr.sqlUpdateExpr(self.valueForAttr(attr)))
  		res = ','.join(res)
! 		res = ('update ', klass.sqlTableName(), ' set ', res, ' where ', klass.sqlSerialColumnName(), '=', str(self.serialNum()))
  		return ''.join(res)
  
***************
*** 623,629 ****
  		assert klass is not None
  		if self.store().model().setting('DeleteBehavior', 'delete')=='mark':
! 			return 'update %s set deleted=%s where %s=%d;' % (klass.sqlTableName(), self.store().sqlNowCall(), klass.sqlIdName(), self.serialNum())
  		else:
! 			return 'delete from %s where %s=%d;' % (klass.sqlTableName(), klass.sqlIdName(), self.serialNum())
  
  	def referencingObjectsAndAttrsFetchKeywordArgs(self, backObjRefAttr):
--- 623,629 ----
  		assert klass is not None
  		if self.store().model().setting('DeleteBehavior', 'delete')=='mark':
! 			return 'update %s set deleted=%s where %s=%d;' % (klass.sqlTableName(), self.store().sqlNowCall(), klass.sqlSerialColumnName(), self.serialNum())
  		else:
! 			return 'delete from %s where %s=%d;' % (klass.sqlTableName(), klass.sqlSerialColumnName(), self.serialNum())
  
  	def referencingObjectsAndAttrsFetchKeywordArgs(self, backObjRefAttr):
***************
*** 646,649 ****
--- 646,652 ----
  
  
+ import MiddleKit.Design.KlassSQLSerialColumnName
+ 
+ 
  class Klass:
  
***************
*** 660,672 ****
  		return self.name()
  
- 	def sqlIdName(self):
- 		name = self.name()
- 		return name[0].lower() + name[1:] + 'Id'
- 
  	def fetchSQLStart(self):
  		if self._fetchSQLStart is None:
  			attrs = self.allDataAttrs()
  			attrs = [attr for attr in attrs if attr.hasSQLColumn()]
! 			colNames = [self.sqlIdName()]
  			colNames.extend([attr.sqlColumnName() for attr in attrs])
  			self._fetchSQLStart = 'select %s from %s ' % (','.join(colNames), self.sqlTableName())
--- 663,671 ----
  		return self.name()
  
  	def fetchSQLStart(self):
  		if self._fetchSQLStart is None:
  			attrs = self.allDataAttrs()
  			attrs = [attr for attr in attrs if attr.hasSQLColumn()]
! 			colNames = [self.sqlSerialColumnName()]
  			colNames.extend([attr.sqlColumnName() for attr in attrs])
  			self._fetchSQLStart = 'select %s from %s ' % (','.join(colNames), self.sqlTableName())
***************
*** 683,687 ****
  			fieldNames = [attr.sqlColumnName() for attr in attrs]
  			if len(fieldNames)==0:
! 				fieldNames = [self.sqlIdName()]
  			res.append(','.join(fieldNames))
  			res.append(') values (')
--- 682,686 ----
  			fieldNames = [attr.sqlColumnName() for attr in attrs]
  			if len(fieldNames)==0:
! 				fieldNames = [self.sqlSerialColumnName()]
  			res.append(','.join(fieldNames))
  			res.append(') values (')