Author: pcl
Date: Sat Feb 16 11:30:20 2008
New Revision: 628375
URL: http://svn.apache.org/viewvc?rev=628375&view=rev
Log:
Enable some of the new tests.
Removed:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestManagedInterfaces.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestManagedInterfacesAppId.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
openjpa/trunk/openjpa-persistence-jdbc/pom.xml
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
Sat Feb 16 11:30:20 2008
@@ -226,7 +226,7 @@
* Return the table for the given class.
*/
public Table getTable(final ClassMapping cls, boolean adapt) {
- return createTable(cls, new TableDefaults() {
+ Table t = createTable(cls, new TableDefaults() {
public String get(Schema schema) {
// delay this so that we don't do schema reflection for unique
// table name unless necessary
@@ -234,6 +234,10 @@
getTableName(cls, schema);
}
}, _schemaName, _tableName, adapt);
+ t.setComment(cls.getTypeAlias() == null
+ ? cls.getDescribedType().getName()
+ : cls.getTypeAlias());
+ return t;
}
/**
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
Sat Feb 16 11:30:20 2008
@@ -699,6 +699,9 @@
if (decimals != 0)
col.setDecimalDigits(decimals);
}
+
+ if (tmplate.hasComment())
+ col.setComment(tmplate.getComment());
return col;
}
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/FullClassStrategy.java
Sat Feb 16 11:30:20 2008
@@ -76,6 +76,7 @@
Column id = new Column();
id.setName("id");
id.setJavaType(JavaTypes.LONG);
+ id.setComment("datastore id");
if (cls.getIdentityStrategy() == ValueStrategies.AUTOASSIGN)
id.setAutoAssigned(true);
id.setNotNull(true);
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
Sat Feb 16 11:30:20 2008
@@ -72,7 +72,8 @@
private int _index = 0;
private boolean _pk = false;
private VersionStrategy _versionStrategy = null;
-
+ private String _comment = null;
+
/**
* Default constructor.
*/
@@ -732,5 +733,17 @@
public void setVersionStrategy(VersionStrategy strategy) {
this._versionStrategy = strategy;
+ }
+
+ public boolean hasComment() {
+ return _comment != null && !_comment.equalsIgnoreCase(_name);
+ }
+
+ public String getComment() {
+ return _comment;
+ }
+
+ public void setComment(String comment) {
+ _comment = comment;
}
}
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Table.java
Sat Feb 16 11:30:20 2008
@@ -60,6 +60,7 @@
private ForeignKey[] _fks = null;
private Index[] _idxs = null;
private Unique[] _unqs = null;
+ private String _comment = null;
/**
* Default constructor.
@@ -688,5 +689,17 @@
public String toString() {
return getFullName();
+ }
+
+ public boolean hasComment() {
+ return _comment != null && !_comment.equalsIgnoreCase(_name);
+ }
+
+ public String getComment() {
+ return _comment;
+ }
+
+ public void setComment(String comment) {
+ _comment = comment;
}
}
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Sat Feb 16 11:30:20 2008
@@ -193,6 +193,7 @@
public boolean supportsDefaultUpdateAction = true;
public boolean supportsAlterTableWithAddColumn = true;
public boolean supportsAlterTableWithDropColumn = true;
+ public boolean supportsComments = false;
public String reservedWords = null;
public String systemSchemas = null;
public String systemTables = null;
@@ -2972,34 +2973,55 @@
*/
public String[] getCreateTableSQL(Table table) {
StringBuffer buf = new StringBuffer();
- buf.append("CREATE TABLE ").append(getFullName(table, false)).
- append(" (");
-
- Column[] cols = table.getColumns();
- for (int i = 0; i < cols.length; i++) {
- if (i > 0)
- buf.append(", ");
- buf.append(getDeclareColumnSQL(cols[i], false));
+ buf.append("CREATE TABLE ").append(getFullName(table, false));
+ if (supportsComments && table.hasComment()) {
+ buf.append(" ");
+ comment(buf, table.getComment());
+ buf.append("\n (");
+ } else {
+ buf.append(" (");
}
+ // do this before getting the columns so we know how to handle
+ // the last comma
+ StringBuffer endBuf = new StringBuffer();
PrimaryKey pk = table.getPrimaryKey();
String pkStr;
if (pk != null) {
pkStr = getPrimaryKeyConstraintSQL(pk);
if (pkStr != null)
- buf.append(", ").append(pkStr);
+ endBuf.append(pkStr);
}
Unique[] unqs = table.getUniques();
String unqStr;
for (int i = 0; i < unqs.length; i++) {
unqStr = getUniqueConstraintSQL(unqs[i]);
- if (unqStr != null)
- buf.append(", ").append(unqStr);
+ if (unqStr != null) {
+ if (endBuf.length() > 0)
+ endBuf.append(", ");
+ endBuf.append(unqStr);
+ }
+ }
+
+ Column[] cols = table.getColumns();
+ for (int i = 0; i < cols.length; i++) {
+ buf.append(getDeclareColumnSQL(cols[i], false));
+ if (i < cols.length - 1 || endBuf.length() > 0)
+ buf.append(", ");
+ if (supportsComments && cols[i].hasComment()) {
+ comment(buf, cols[i].getComment());
+ buf.append("\n ");
+ }
}
+ buf.append(endBuf.toString());
buf.append(")");
return new String[]{ buf.toString() };
+ }
+
+ protected StringBuffer comment(StringBuffer buf, String comment) {
+ return buf.append("-- ").append(comment);
}
/**
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
Sat Feb 16 11:30:20 2008
@@ -61,6 +61,8 @@
requiresCastForMathFunctions = true;
requiresCastForComparisons = true;
+ supportsComments = true;
+
fixedSizeTypeNameSet.addAll(Arrays.asList(new String[]{
"BIGINT", "INTEGER",
}));
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
(original)
+++
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
Sat Feb 16 11:30:20 2008
@@ -4339,9 +4339,12 @@
if (_closedException == null) // TRACE not enabled
throw new InvalidStateException(_loc.get("closed-notrace"))
.setFatal(true);
- else
- throw new InvalidStateException(_loc.get("closed"),
- _closedException).setFatal(true);
+ else {
+ OpenJPAException e = new InvalidStateException(
+ _loc.get("closed"), _closedException).setFatal(true);
+ e.setCause(_closedException);
+ throw e;
+ }
}
}
Modified: openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/pom.xml Sat Feb 16 11:30:20 2008
@@ -327,6 +327,10 @@
<!-- exclude new tests that aren't passing yet -->
<exclude>org/apache/openjpa/persistence/jpql/clauses/TestEJBQueryInterface.java</exclude>
+
<exclude>org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java</exclude>
+
<exclude>org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java</exclude>
+
<exclude>org/apache/openjpa/persistence/query/TestQuotedNumbersInFilters2.java</exclude>
+
<exclude>org/apache/openjpa/persistence/kernel/TestEJBEmbedded.java</exclude>
<exclude>org/apache/openjpa/persistence/annotations/TestAdvAnnot.java</exclude>
<exclude>org/apache/openjpa/persistence/annotations/TestDDCallbackMethods.java</exclude>
@@ -436,72 +440,35 @@
<exclude>org/apache/openjpa/persistence/kernel/TestArrayValues2.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestBigDecimals.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestBrokerFactoryPooling.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestCalendarFields.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestCheckConsistency.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestClassStringConstructor.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestConnectionRetainMode.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestDateQueries.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestDependentFields2.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestDetachedStateManager.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBEntityManager.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBGetObjectByIdValue.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestEJBIncrementalFlushes.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBLobs.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBLocales.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBManagedInverses.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestEJBNoPersistentFields.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBNullValues.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestEJBObjectCollections.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestEJBRetainValues.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBState.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestEJBTransactionalClass.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestEJBTransactions.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestExtents.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestExtents2.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestFetchGroups.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestFetchGroupsExtent.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestFetchGroupsQuery.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestFetchPlan.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestFieldRange.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestFieldRange2.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestFieldState.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestGetObjectsById.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestIncrementalFlushes.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestIncrementalFlushesDeletes.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestInheritance.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestInitialValueFetching.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestInstanceCallbacks.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestManagedInterfaces.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestManagedInterfacesAppId.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestMultiThreaded.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestNTW.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestOpenResultsCommit.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestOptimisticLockGroups.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestPCClass.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestPersistenceManager.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestPersistentMaps.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestPessimisticLocking.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestPMMemory.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestPojoWithoutAnnotationsCannotBePersisted.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestProxies2.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestQueries.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestRestoreValues.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSavepointEmbedded.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSavepointEmbeddedPreFlush.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestSavepointOrdering.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestSavepoints.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSecondClassValues.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestSecurityContext.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestSequence.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSerialize.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestSimple.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java</exclude>
<exclude>org/apache/openjpa/persistence/kernel/TestSpecialNumbers2.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestStateManagerImplData.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java</exclude>
-
<exclude>org/apache/openjpa/persistence/kernel/TestStoreBlob.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestClassMetaData.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestExternalValues.java</exclude>
<exclude>org/apache/openjpa/persistence/meta/TestFieldDeclarationOrder.java</exclude>
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/common/utils/AbstractTestCase.java
Sat Feb 16 11:30:20 2008
@@ -203,7 +203,8 @@
protected void addProperties(Map map) {
if (!map.containsKey("openjpa.jdbc.SynchronizeMappings"))
map.put("openjpa.jdbc.SynchronizeMappings",
- "buildSchema(ForeignKeys=true)");
+ "buildSchema(ForeignKeys=true," +
+ "SchemaAction='add,deleteTableContents')");
}
protected OpenJPAEntityManagerFactory getEmf() {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/BaseKernelTest.java
Sat Feb 16 11:30:20 2008
@@ -81,10 +81,6 @@
return em;
}
- protected OpenJPAStateManager getStateManager(Object obj,EntityManager
pm) {
- return getStateManager(obj,pm);
- }
-
protected Object persist(Object ob) {
//FIXME - this is just a workaround
// Broker broker = .getBrokerFactory().newBroker();
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestDependentFields2.java
Sat Feb 16 11:30:20 2008
@@ -480,11 +480,11 @@
action = COMMIT;
} else {
try {
- endTx(pm);
+ pm.getTransaction().commit();
fail("Committed with ref to deleted dependent object");
} catch (Exception je) {
- } finally {
rollbackTx(pm);
+ } finally {
}
break;
}
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestEJBLobs.java
Sat Feb 16 11:30:20 2008
@@ -159,6 +159,7 @@
@SuppressWarnings("serial")
@Entity
+ @Table(name="Inner2")
public static class Inner2 implements Serializable {
@Id
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestPersistenceManagerFactoryImpl.java
Sat Feb 16 11:30:20 2008
@@ -192,7 +192,7 @@
protected OpenJPAEntityManagerFactory getEmf(Map props) {
props.put("openjpa.BrokerFactory", BrokerFactoryTest.class.getName());
- return (OpenJPAEntityManagerFactory) getEmf(props);
+ return (OpenJPAEntityManagerFactory) super.getEmf(props);
}
public static class BrokerFactoryTest extends AbstractBrokerFactory {
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestRetainValuesInOptimistic.java
Sat Feb 16 11:30:20 2008
@@ -67,6 +67,12 @@
endEm(pm);
}
+ @Override
+ protected void addProperties(Map map) {
+ super.addProperties(map);
+ map.put("openjpa.Log", "SQL=TRACE, Runtime=TRACE");
+ }
+
public void testRetain() {
clearTest(true);
optLockTest(true);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestSpecialNumbers.java
Sat Feb 16 11:30:20 2008
@@ -62,14 +62,14 @@
public void testShortMax() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestshort(Short.MAX_VALUE);
- saveAndQuery(aftt, "testshort == param", new Short(Short.MAX_VALUE));
+ saveAndQuery(aftt, "testshort = :param", new Short(Short.MAX_VALUE));
}
public void testShortMin() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestshort(Short.MIN_VALUE);
try {
- saveAndQuery(aftt, "testshort == param",
+ saveAndQuery(aftt, "testshort = :param",
new Short(Short.MIN_VALUE));
} catch (Throwable t) {
bug(AbstractTestCase.Platform.EMPRESS, 889, t,
@@ -80,14 +80,14 @@
public void testLongMax() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestlong(Long.MAX_VALUE);
- saveAndQuery(aftt, "testlong == param", new Long(Long.MAX_VALUE));
+ saveAndQuery(aftt, "testlong = :param", new Long(Long.MAX_VALUE));
}
public void testLongMin() {
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestlong(Long.MIN_VALUE);
- saveAndQuery(aftt, "testlong == param", new Long(Long.MIN_VALUE));
+ saveAndQuery(aftt, "testlong = :param", new Long(Long.MIN_VALUE));
} catch (Throwable t) {
bug(AbstractTestCase.Platform.HYPERSONIC, 474, t,
"Some databases cannot store Long.MIN_VALUE");
@@ -97,7 +97,7 @@
public void testIntegerMax() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestint(Integer.MAX_VALUE);
- saveAndQuery(aftt, "testint == param",
+ saveAndQuery(aftt, "testint = :param",
new Integer(Integer.MAX_VALUE));
}
@@ -105,7 +105,7 @@
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestint(Integer.MIN_VALUE);
try {
- saveAndQuery(aftt, "testint == param",
+ saveAndQuery(aftt, "testint = :param",
new Integer(Integer.MIN_VALUE));
} catch (Throwable t) {
bug(AbstractTestCase.Platform.EMPRESS, 889, t,
@@ -117,7 +117,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestfloat(Float.MAX_VALUE);
- saveAndQuery(aftt, "testfloat == param",
+ saveAndQuery(aftt, "testfloat = :param",
new Float(Float.MAX_VALUE));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POSTGRESQL,
@@ -132,7 +132,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestfloat(Float.MIN_VALUE);
- saveAndQuery(aftt, "testfloat == param",
+ saveAndQuery(aftt, "testfloat = :param",
new Float(Float.MIN_VALUE));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POSTGRESQL,
@@ -152,7 +152,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestfloat(Float.NaN);
- saveAndQuery(aftt, "testfloat == param", new Float(Float.NaN));
+ saveAndQuery(aftt, "testfloat = :param", new Float(Float.NaN));
} catch (Throwable t) {
bug(461, t, "NaN problems");
}
@@ -162,7 +162,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestfloat(Float.NEGATIVE_INFINITY);
- saveAndQuery(aftt, "testfloat == param",
+ saveAndQuery(aftt, "testfloat = :param",
new Float(Float.NEGATIVE_INFINITY));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POINTBASE,
@@ -181,7 +181,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestfloat(Float.POSITIVE_INFINITY);
- saveAndQuery(aftt, "testfloat == param",
+ saveAndQuery(aftt, "testfloat = :param",
new Float(Float.POSITIVE_INFINITY));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POINTBASE,
@@ -200,7 +200,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestdouble(Double.MAX_VALUE);
- saveAndQuery(aftt, "testdouble == param",
+ saveAndQuery(aftt, "testdouble = :param",
new Double(Double.MAX_VALUE));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POINTBASE,
@@ -219,7 +219,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestdouble(Double.MIN_VALUE);
- saveAndQuery(aftt, "testdouble == param",
+ saveAndQuery(aftt, "testdouble = :param",
new Double(Double.MIN_VALUE));
} catch (Exception e) {
bug(EnumSet.of(AbstractTestCase.Platform.POSTGRESQL,
@@ -240,7 +240,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestdouble(Double.NaN);
- saveAndQuery(aftt, "testdouble == param", new Double(Double.NaN));
+ saveAndQuery(aftt, "testdouble = :param", new Double(Double.NaN));
} catch (Throwable t) {
bug(461, t, "NaN problems");
}
@@ -250,7 +250,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestdouble(Double.NEGATIVE_INFINITY);
- saveAndQuery(aftt, "testdouble == param",
+ saveAndQuery(aftt, "testdouble = :param",
new Double(Double.NEGATIVE_INFINITY));
} catch (Throwable t) {
bug(461, t, "infinity problems");
@@ -261,7 +261,7 @@
try {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestdouble(Double.POSITIVE_INFINITY);
- saveAndQuery(aftt, "testdouble == param",
+ saveAndQuery(aftt, "testdouble = :param",
new Double(Double.POSITIVE_INFINITY));
} catch (Throwable t) {
bug(461, t, "infinity problems");
@@ -272,7 +272,7 @@
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestbyte(Byte.MIN_VALUE);
try {
- saveAndQuery(aftt, "testbyte == param", new Byte(Byte.MIN_VALUE));
+ saveAndQuery(aftt, "testbyte = :param", new Byte(Byte.MIN_VALUE));
} catch (Throwable t) {
bug(AbstractTestCase.Platform.EMPRESS, 889, t,
"Empress cannot store min values");
@@ -282,19 +282,19 @@
public void testByteMax() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestbyte(Byte.MAX_VALUE);
- saveAndQuery(aftt, "testbyte == param", new Byte(Byte.MAX_VALUE));
+ saveAndQuery(aftt, "testbyte = :param", new Byte(Byte.MAX_VALUE));
}
public void testZeroBigInteger() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestBigInteger(BigInteger.ZERO);
- saveAndQuery(aftt, "testBigInteger == param", BigInteger.ZERO);
+ saveAndQuery(aftt, "testBigInteger = :param", BigInteger.ZERO);
}
public void testOneBigInteger() {
AllFieldTypesTest aftt = new AllFieldTypesTest();
aftt.setTestBigInteger(BigInteger.ONE);
- saveAndQuery(aftt, "testBigInteger == param", BigInteger.ONE);
+ saveAndQuery(aftt, "testBigInteger = :param", BigInteger.ONE);
}
private void saveAndQuery(Object obj, String query, Object param) {
@@ -305,9 +305,9 @@
endEm(pm);
pm = getPM();
- OpenJPAQuery q = pm.createNativeQuery(query, obj.getClass());
- //FIXME jthomas
- //q.declareParameters("Object param");
+ OpenJPAQuery q = pm.createQuery("select o from "
+ + obj.getClass().getName() + " o where " + query);
+ q.setParameter("param", param);
Collection c = (Collection) q.getResultList();
assertSize(1, c);
endEm(pm);
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/TestStaticInnerClasses.java
Sat Feb 16 11:30:20 2008
@@ -30,7 +30,7 @@
import java.util.LinkedList;
import java.util.List;
import javax.persistence.Entity;
-
+import javax.persistence.Table;
import org.apache.openjpa.persistence.OpenJPAEntityManager;
@@ -116,6 +116,7 @@
}
@Entity
+ @Table(name="StaticInner")
public static class Inner {
private int num = 0;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/Inner.java
Sat Feb 16 11:30:20 2008
@@ -24,6 +24,7 @@
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import javax.persistence.Column;
@Entity
@Table(name = "nullvalue")
@@ -31,8 +32,11 @@
@Basic
private Integer none = null;
+
@Basic(optional = false)
+ @Column(name="exception_col")
private Integer exception = null;
+
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
private int Id;
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCDirectory.java
Sat Feb 16 11:30:20 2008
@@ -29,6 +29,7 @@
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
+import javax.persistence.Column;
import org.apache.openjpa.persistence.FetchAttribute;
import org.apache.openjpa.persistence.FetchGroup;
@@ -63,6 +64,7 @@
@GeneratedValue(strategy = GenerationType.AUTO)
private int id;
+ @Column(name="name_col")
private String _name;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java?rev=628375&r1=628374&r2=628375&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/PCFile.java
Sat Feb 16 11:30:20 2008
@@ -26,10 +26,12 @@
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.ManyToOne;
+import javax.persistence.Column;
@Entity
public class PCFile {
+ @Column(name="name_col")
private String _name;
@ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
