From 5fb9e7172681211588a526257d8c5a1bb5111530 Mon Sep 17 00:00:00 2001 From: Heath Thomann Date: Thu, 31 May 2012 21:17:41 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1344914 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/openjpa/jdbc/sql/DBDictionary.java | 9 +-- .../jdbc/TestTimestampPKDeletion.java | 58 +++++++++++++++++ .../simple/EntityWithTimestampPK.java | 62 +++++++++++++++++++ 3 files changed, 125 insertions(+), 4 deletions(-) create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java index 4568c2c63..7ae1f1b63 100644 --- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java +++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java @@ -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); } /** diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java new file mode 100644 index 000000000..dcf309bd6 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestTimestampPKDeletion.java @@ -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 testEntities = q.getResultList(); + for (EntityWithTimestampPK t : testEntities) { + em.remove(t); + } + tx.commit(); + em.close(); + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java new file mode 100644 index 000000000..2c2fc3af5 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/simple/EntityWithTimestampPK.java @@ -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; + } + + +}