Author: hthomann
Date: Thu May 31 21:17:41 2012
New Revision: 1344914
URL: http://svn.apache.org/viewvc?rev=1344914&view=rev
Log:
OPENJPA-2072: Applied Helen Xu's patch to trunk, and applied test case changes
as Albert had done in JIRA OPENJPA-2095 for issue with using Test* in entity
name.
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
(with props)
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java
(with props)
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
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=1344914&r1=1344913&r2=1344914&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
Thu May 31 21:17:41 2012
@@ -1253,13 +1253,14 @@ public class DBDictionary
val.setTime(val.getTime() + 1000);
nanos = 0;
}
-
- val.setNanos(nanos);
+
+ Timestamp valForStmnt = new Timestamp(val.getTime());
+ valForStmnt.setNanos(nanos);
if (cal == null)
- stmnt.setTimestamp(idx, val);
+ stmnt.setTimestamp(idx, valForStmnt);
else
- stmnt.setTimestamp(idx, val, cal);
+ stmnt.setTimestamp(idx, valForStmnt, cal);
}
/**
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java?rev=1344914&view=auto
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
(added)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
Thu May 31 21:17:41 2012
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.jdbc;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+import javax.persistence.Query;
+
+import org.apache.openjpa.persistence.simple.EntityWithTimestampPK;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestTimestampPKDeletion extends SQLListenerTestCase {
+
+ public void setUp() {
+ setUp(EntityWithTimestampPK.class);
+ }
+
+ public void testTimestampPKDeletion() {
+ EntityWithTimestampPK testEntity = new EntityWithTimestampPK("test");
+
+ EntityManager em = emf.createEntityManager();
+
+ em.getTransaction().begin();
+ em.persist(testEntity);
+ em.getTransaction().commit();
+ em.close();
+
+ em = emf.createEntityManager();
+ final EntityTransaction tx = em.getTransaction();
+ tx.begin();
+ final Query q = em.createQuery("SELECT testEntity FROM
EntityWithTimestampPK testEntity ");
+
+ final List<EntityWithTimestampPK> testEntities = q.getResultList();
+ for (EntityWithTimestampPK t : testEntities) {
+ em.remove(t);
+ }
+ tx.commit();
+ em.close();
+ }
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java?rev=1344914&view=auto
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java
(added)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java
Thu May 31 21:17:41 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.persistence.simple;
+
+import java.sql.Timestamp;
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class EntityWithTimestampPK {
+
+ @Id
+ private Timestamp idTsp;
+
+ private String description;
+
+ public Timestamp getIdTsp() {
+ return idTsp;
+ }
+
+ public EntityWithTimestampPK(String desc) {
+ super();
+ this.idTsp = new Timestamp((new Date()).getTime());
+ this.description = desc;
+ }
+
+ public EntityWithTimestampPK(){
+
+ }
+
+ public void setIdTsp(Timestamp idTsp) {
+ this.idTsp = idTsp;
+ }
+
+ public String getDesc() {
+ return description;
+ }
+
+ public void setDesc(String desc) {
+ this.description = desc;
+ }
+
+
+}
Propchange:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java
------------------------------------------------------------------------------
svn:eol-style = native
