You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ht...@apache.org on 2012/05/24 17:04:57 UTC
svn commit: r1342291 - in /openjpa/branches/2.1.x:
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence...
Author: hthomann
Date: Thu May 24 15:04:57 2012
New Revision: 1342291
URL: http://svn.apache.org/viewvc?rev=1342291&view=rev
Log:
OPENJPA-2072: Applied Helen Xu's patch to 2.1.x
Added:
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java (with props)
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java (with props)
Modified:
openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Modified: openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=1342291&r1=1342290&r2=1342291&view=diff
==============================================================================
--- openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Thu May 24 15:04:57 2012
@@ -1219,13 +1219,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/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java?rev=1342291&view=auto
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java (added)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java Thu May 24 15:04:57 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.TestEntityWithTimestampPK;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestTimestampPKDeletion extends SQLListenerTestCase {
+
+ public void setUp() {
+ setUp(TestEntityWithTimestampPK.class);
+ }
+
+ public void testTimestampPKDeletion() {
+ TestEntityWithTimestampPK testEntity = new TestEntityWithTimestampPK("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 TestEntityWithTimestampPK testEntity ");
+
+ final List<TestEntityWithTimestampPK> testEntities = q.getResultList();
+ for (TestEntityWithTimestampPK t : testEntities) {
+ em.remove(t);
+ }
+ tx.commit();
+ em.close();
+ }
+}
Propchange: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java?rev=1342291&view=auto
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java (added)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java Thu May 24 15:04:57 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 TestEntityWithTimestampPK {
+
+ @Id
+ private Timestamp idTsp;
+
+ private String description;
+
+ public Timestamp getIdTsp() {
+ return idTsp;
+ }
+
+ public TestEntityWithTimestampPK(String desc) {
+ super();
+ this.idTsp = new Timestamp((new Date()).getTime());
+ this.description = desc;
+ }
+
+ public TestEntityWithTimestampPK(){
+
+ }
+
+ public void setIdTsp(Timestamp idTsp) {
+ this.idTsp = idTsp;
+ }
+
+ public String getDesc() {
+ return description;
+ }
+
+ public void setDesc(String desc) {
+ this.description = desc;
+ }
+
+
+}
Propchange: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/TestEntityWithTimestampPK.java
------------------------------------------------------------------------------
svn:eol-style = native