jmcnally 02/03/08 15:07:48
Modified: src/templates/om Peer.vm
src/rttest bookstore-schema.xml
Log:
do not create retrieveByPK methods if the table has no pk defined.
added a table to the test schema that does not contain a pk.
Revision Changes Path
1.16 +11 -10 jakarta-turbine-torque/src/templates/om/Peer.vm
Index: Peer.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Peer.vm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Peer.vm 2 Mar 2002 02:23:55 -0000 1.15
+++ Peer.vm 8 Mar 2002 23:07:47 -0000 1.16
@@ -798,12 +798,13 @@
#end ## ends if (!$table.isAlias())
+#if ($table.PrimaryKeys.size() > 0)
-#if ($table.isAlias())
+ #if ($table.isAlias())
#set ($retrieveMethod = "retrieve${table.JavaName}ByPK")
-#else
+ #else
#set ($retrieveMethod = "retrieveByPK")
-#end
+ #end
/**
* Retrieve a single object by pk
@@ -839,9 +840,9 @@
{
Criteria criteria = new Criteria();
-#if ($table.PrimaryKeys.size() == 1)
+ #if ($table.PrimaryKeys.size() == 1)
criteria.add( $table.PrimaryKeys.get(0).Name.toUpperCase(), pk );
-#else
+ #else
SimpleKey[] keys = (SimpleKey[])pk.getValue();
#set ( $i = 0 )
#foreach ($col in $table.PrimaryKeys)
@@ -849,7 +850,7 @@
criteria.add( $cup, keys[$i] );
#set ( $i = $i + 1 )
#end
-#end
+ #end
Vector v = doSelect(criteria, dbcon);
if ( v.size() != 1)
{
@@ -902,9 +903,9 @@
else
{
Criteria criteria = new Criteria();
-#if ($table.PrimaryKeys.size() == 1)
+ #if ($table.PrimaryKeys.size() == 1)
criteria.addIn( $table.PrimaryKeys.get(0).Name.toUpperCase(), pks );
-#else
+ #else
Iterator iter = pks.iterator();
while (iter.hasNext())
{
@@ -923,13 +924,13 @@
#end
criteria.or(c0);
}
-#end
+ #end
objs = doSelect(criteria, dbcon);
}
return objs;
}
-
+#end ## ends if($table.PrimaryKeys.size() > 0)
#if ($table.PrimaryKeys.size() > 1)
#set ( $comma = false )
1.8 +17 -0 jakarta-turbine-torque/src/rttest/bookstore-schema.xml
Index: bookstore-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/rttest/bookstore-schema.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bookstore-schema.xml 7 Mar 2002 23:29:54 -0000 1.7
+++ bookstore-schema.xml 8 Mar 2002 23:07:47 -0000 1.8
@@ -182,4 +182,21 @@
</table>
+
+ <!-- =================================================== -->
+ <!-- N O P K T A B L E -->
+ <!-- =================================================== -->
+
+ <table name="nopk" idMethod="none" description="this table has no pk">
+ <column
+ name="intcol"
+ type="INTEGER"
+ />
+ <column
+ name="name"
+ type="VARCHAR"
+ size="50"
+ />
+ </table>
+
</database>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
