You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2008/01/16 09:17:10 UTC
svn commit: r612384 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src:
main/java/org/apache/cayenne/access/ main/java/org/apache/cayenne/dba/
main/java/org/apache/cayenne/dba/openbase/ test/java/org/apache/cayenne/
test/java/org/apache/...
Author: aadamchik
Date: Wed Jan 16 00:17:08 2008
New Revision: 612384
URL: http://svn.apache.org/viewvc?rev=612384&view=rev
Log:
CAY-961 Change PK generator API to take PK DbAttribute parameter; generate pk based on DbAttribute type
(better method naming)
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainInsertBucket.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/FlattenedArcKey.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkGenerator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainInsertBucket.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainInsertBucket.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainInsertBucket.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DataDomainInsertBucket.java Wed Jan 16 00:17:08 2008
@@ -162,7 +162,7 @@
// finally, use database generation mechanism
try {
- Object pkValue = pkGenerator.generatePkForDbEntity(node, dbAttr);
+ Object pkValue = pkGenerator.generatePk(node, dbAttr);
idMap.put(dbAttrName, pkValue);
autoPkDone = true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/FlattenedArcKey.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/FlattenedArcKey.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/FlattenedArcKey.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/FlattenedArcKey.java Wed Jan 16 00:17:08 2008
@@ -122,7 +122,7 @@
// finally, use database generation mechanism
try {
PkGenerator pkGenerator = node.getAdapter().getPkGenerator();
- Object pkValue = pkGenerator.generatePkForDbEntity(node, dbAttr);
+ Object pkValue = pkGenerator.generatePk(node, dbAttr);
snapshot.put(dbAttrName, pkValue);
autoPkDone = true;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/JdbcPkGenerator.java Wed Jan 16 00:17:08 2008
@@ -108,7 +108,7 @@
buf
.append("CREATE TABLE AUTO_PK_SUPPORT (")
.append(" TABLE_NAME CHAR(100) NOT NULL,")
- .append(" NEXT_ID INTEGER NOT NULL,")
+ .append(" NEXT_ID BIGINT NOT NULL,")
.append(" PRIMARY KEY(TABLE_NAME)")
.append(")");
@@ -217,7 +217,7 @@
*
* @since 3.0
*/
- public Object generatePkForDbEntity(DataNode node, DbAttribute pk) throws Exception {
+ public Object generatePk(DataNode node, DbAttribute pk) throws Exception {
DbEntity entity = (DbEntity) pk.getEntity();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkGenerator.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/PkGenerator.java Wed Jan 16 00:17:08 2008
@@ -68,7 +68,7 @@
* Generates new (unique and non-repeating) primary key for specified DbEntity.
*
* @param ent DbEntity for which automatic PK is generated.
- * @deprecated since 3.0 use {@link #generatePkForDbEntity(DataNode, DbAttribute)}.
+ * @deprecated since 3.0 use {@link #generatePk(DataNode, DbAttribute)}.
*/
Object generatePkForDbEntity(DataNode dataNode, DbEntity ent) throws Exception;
@@ -77,7 +77,7 @@
*
* @since 3.0
*/
- Object generatePkForDbEntity(DataNode dataNode, DbAttribute pk) throws Exception;
+ Object generatePk(DataNode dataNode, DbAttribute pk) throws Exception;
/**
* Resets any cached primary keys forcing generator to go to the database next time id
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java Wed Jan 16 00:17:08 2008
@@ -69,7 +69,7 @@
* @since 3.0
*/
@Override
- public Object generatePkForDbEntity(DataNode node, DbAttribute pk) throws Exception {
+ public Object generatePk(DataNode node, DbAttribute pk) throws Exception {
DbEntity entity = (DbEntity) pk.getEntity();
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/PregeneratedPKTest.java Wed Jan 16 00:17:08 2008
@@ -66,7 +66,7 @@
DbEntity entity = context.getEntityResolver().getDbEntity("ARTIST");
DataNode node = context.getParentDataDomain().lookupDataNode(entity.getDataMap());
- Object pk = node.getAdapter().getPkGenerator().generatePkForDbEntity(
+ Object pk = node.getAdapter().getPkGenerator().generatePk(
node,
entity.getPrimaryKeys().iterator().next());
id.getReplacementIdMap().put(Artist.ARTIST_ID_PK_COLUMN, pk);
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataContextExtrasTest.java Wed Jan 16 00:17:08 2008
@@ -195,7 +195,7 @@
}
@Override
- public Object generatePkForDbEntity(DataNode node, DbAttribute pk)
+ public Object generatePk(DataNode node, DbAttribute pk)
throws Exception {
throw new CayenneRuntimeException("Synthetic error....");
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/DataNodeQueriesTest.java Wed Jan 16 00:17:08 2008
@@ -53,12 +53,12 @@
DataNode node = getNode();
DbEntity artistEnt = node.getEntityResolver().getDbEntity("ARTIST");
- assertNotNull(node.getAdapter().getPkGenerator().generatePkForDbEntity(
+ assertNotNull(node.getAdapter().getPkGenerator().generatePk(
node,
artistEnt.getPrimaryKeys().iterator().next()));
DbEntity exhibitEnt = node.getEntityResolver().getDbEntity("EXHIBIT");
- assertNotNull(node.getAdapter().getPkGenerator().generatePkForDbEntity(
+ assertNotNull(node.getAdapter().getPkGenerator().generatePk(
node,
exhibitEnt.getPrimaryKeys().iterator().next()));
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java?rev=612384&r1=612383&r2=612384&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/dba/PkGeneratorTest.java Wed Jan 16 00:17:08 2008
@@ -54,7 +54,7 @@
}
for (int i = 0; i < testSize; i++) {
- Object pk = pkGen.generatePkForDbEntity(node, paintEnt
+ Object pk = pkGen.generatePk(node, paintEnt
.getPrimaryKeys()
.iterator()
.next());
@@ -72,6 +72,9 @@
}
}
+ /**
+ * @deprecated since 3.0
+ */
public void testBinaryPK1() throws Exception {
if (!(pkGen instanceof JdbcPkGenerator)) {
return;
@@ -81,6 +84,9 @@
assertNull(((JdbcPkGenerator) pkGen).binaryPK(artistEntity));
}
+ /**
+ * @deprecated since 3.0
+ */
public void testBinaryPK2() throws Exception {
if (!(pkGen instanceof JdbcPkGenerator)) {
return;