openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hthom...@apache.org
Subject svn commit: r1332307 - 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/temporal/
Date Mon, 30 Apr 2012 17:28:30 GMT
Author: hthomann
Date: Mon Apr 30 17:28:30 2012
New Revision: 1332307

URL: http://svn.apache.org/viewvc?rev=1332307&view=rev
Log:
OPENJPA-2159: Provide dictionary option for Date rounding - merged Dianne's changes from trunk.

Added:
    openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/
    openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java
  (with props)
    openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.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=1332307&r1=1332306&r2=1332307&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
Mon Apr 30 17:28:30 2012
@@ -292,6 +292,7 @@ public class DBDictionary
     public int maxEmbeddedClobSize = -1;
     public int inClauseLimit = -1;
     public int datePrecision = MILLI;
+    public boolean roundTimeToMillisec = true;
     public int characterColumnSize = 255;
     public String arrayTypeName = "ARRAY";
     public String bigintTypeName = "BIGINT";
@@ -746,7 +747,10 @@ public class DBDictionary
 
         // get the fractional seconds component, rounding away anything beyond
         // milliseconds
-        int fractional = (int) Math.round(tstamp.getNanos() / (double) MILLI);
+        int fractional = 0;
+        if (roundTimeToMillisec) {
+            fractional = (int) Math.round(tstamp.getNanos() / (double) MILLI);
+        }
 
         // get the millis component; some JDBC drivers round this to the
         // nearest second, while others do not

Added: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java?rev=1332307&view=auto
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java
(added)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java
Mon Apr 30 17:28:30 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.temporal;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+@Entity
+public class TemporalEntity {
+    @Id
+    private Integer id;
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date testDate;
+
+    
+    public TemporalEntity(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public Date getTestDate() {
+        return testDate;
+    }
+
+    public void setTestDate(Date testDate) {
+        this.testDate = testDate;
+        
+    }
+
+}

Propchange: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TemporalEntity.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java?rev=1332307&view=auto
==============================================================================
--- openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
(added)
+++ openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
Mon Apr 30 17:28:30 2012
@@ -0,0 +1,110 @@
+/*
+ * 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.temporal;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaQuery;
+
+import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
+import org.apache.openjpa.jdbc.sql.DBDictionary;
+import org.apache.openjpa.persistence.OpenJPAEntityManager;
+import org.apache.openjpa.persistence.test.SQLListenerTestCase;
+
+public class TestTemporalTimestamp extends SQLListenerTestCase {
+    private OpenJPAEntityManager em;
+    
+    
+    public void setUp() {
+        setSupportedDatabases(
+            org.apache.openjpa.jdbc.sql.DerbyDictionary.class,
+            org.apache.openjpa.jdbc.sql.DB2Dictionary.class);
+        if (isTestsDisabled()) {
+            return;
+        }
+        
+        setUp(CLEAR_TABLES, TemporalEntity.class, "openjpa.jdbc.DBDictionary", "RoundTimeToMillisec=false");
+        assertNotNull(emf);
+        
+        loadDB();
+    }
+    
+    public void testNoRounding() {
+        em = emf.createEntityManager();
+        final List<TemporalEntity> temporalEntityList = findAll(em);
+        assertNotNull(temporalEntityList);
+        assertNotEquals(temporalEntityList.size(), 0);
+        for (final TemporalEntity temporalEntity : temporalEntityList) {
+            Date testDate = temporalEntity.getTestDate();
+            assertEquals(testDate.getDay(), 5);
+            assertEquals(testDate.getMonth(), 11);
+            assertEquals(testDate.getDate(), 31);
+            assertEquals(testDate.getHours(), 23);
+            assertEquals(testDate.getMinutes(), 59);
+            assertEquals(testDate.getSeconds(), 59);
+            assertEquals(testDate.getYear(), 8099);
+        }
+        em.close();
+    }
+    
+    public void testRounding() {
+        JDBCConfiguration conf = (JDBCConfiguration) emf.getConfiguration();
+        DBDictionary dict = conf.getDBDictionaryInstance();
+        // set value back to default
+        dict.roundTimeToMillisec = true;
+        
+        em = emf.createEntityManager();
+        final List<TemporalEntity> temporalEntityList = findAll(em);
+        assertNotNull(temporalEntityList);
+        assertNotEquals(temporalEntityList.size(), 0);
+        for (final TemporalEntity temporalEntity : temporalEntityList) {
+            Date testDate = temporalEntity.getTestDate();
+            assertEquals(testDate.getDay(), 6);
+            assertEquals(testDate.getMonth(), 0);
+            assertEquals(testDate.getDate(), 1);
+            assertEquals(testDate.getHours(), 0);
+            assertEquals(testDate.getMinutes(), 0);
+            assertEquals(testDate.getSeconds(), 0);
+            assertEquals(testDate.getYear(), 8100);
+        }
+        em.close();
+    }
+    
+    public List<TemporalEntity> findAll(EntityManager em) {
+        final CriteriaQuery<TemporalEntity> critQuery = em.getCriteriaBuilder().createQuery(TemporalEntity.class);
+        critQuery.from(TemporalEntity.class);
+        final TypedQuery<TemporalEntity> typedQuery = em.createQuery(critQuery);
+        return typedQuery.getResultList();
+    }
+
+    private void loadDB() {
+        em = emf.createEntityManager();
+        em.getTransaction().begin();
+        String sql = "INSERT INTO TemporalEntity (Id, testDate) VALUES (1, '9999-12-31 23:59:59.9999')";
+        em.createNativeQuery(sql).executeUpdate();
+        sql = "INSERT INTO TemporalEntity (Id, testDate) VALUES (2, '9999-12-31 23:59:59.9996')";
+        em.createNativeQuery(sql).executeUpdate();
+        em.getTransaction().commit();
+        em.close();
+    }
+
+}

Propchange: openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/temporal/TestTemporalTimestamp.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message