From e7e7fe978b9e1f1b460544d7da7361785c58e00b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 9 Jan 2015 13:37:22 +0100 Subject: [PATCH] [Bugfix] fixed missing timestamps from postgresql dates --- .../persistence/postgresql/PostgreSqlAuditDao.java | 9 +++++---- .../persistence/postgresql/PostgreSqlOrderDao.java | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java index ad80954b2..e1601224d 100644 --- a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java +++ b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlAuditDao.java @@ -19,6 +19,7 @@ import java.sql.Date; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; +import java.sql.Timestamp; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Calendar; @@ -315,14 +316,14 @@ public class PostgreSqlAuditDao implements AuditDao { ps.setString(2, audit.getUsername()); ps.setString(3, audit.getFirstname()); ps.setString(4, audit.getLastname()); - ps.setDate(5, new Date(audit.getDate().getTime()), Calendar.getInstance()); + ps.setTimestamp(5, new Timestamp(audit.getDate().getTime()), Calendar.getInstance()); ps.setString(6, audit.getElementType()); ps.setString(7, audit.getElementAccessed()); if (audit.getNewVersion() == null) ps.setDate(8, null); else - ps.setDate(8, new Date(audit.getNewVersion().getTime()), Calendar.getInstance()); + ps.setTimestamp(8, new Timestamp(audit.getNewVersion().getTime()), Calendar.getInstance()); ps.setString(9, audit.getAction()); ps.setString(10, audit.getAccessType().name()); @@ -335,10 +336,10 @@ public class PostgreSqlAuditDao implements AuditDao { audit.setUsername(resultSet.getString(2)); audit.setFirstname(resultSet.getString(3)); audit.setLastname(resultSet.getString(4)); - audit.setDate(resultSet.getDate(5)); + audit.setDate(resultSet.getTimestamp(5)); audit.setElementType(resultSet.getString(6)); audit.setElementAccessed(resultSet.getString(7)); - audit.setNewVersion(resultSet.getDate(8)); + audit.setNewVersion(resultSet.getTimestamp(8)); audit.setAction(resultSet.getString(9)); audit.setAccessType(AccessType.valueOf(resultSet.getString(10))); return audit; diff --git a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java index d5268098b..fbf7740c5 100644 --- a/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java +++ b/li.strolch.persistence.postgresql/src/main/java/li/strolch/persistence/postgresql/PostgreSqlOrderDao.java @@ -17,11 +17,11 @@ package li.strolch.persistence.postgresql; import java.io.IOException; import java.io.InputStream; -import java.sql.Date; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLXML; +import java.sql.Timestamp; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Calendar; @@ -107,7 +107,7 @@ public class PostgreSqlOrderDao extends PostgresqlDao implements OrderDao preparedStatement.setString(2, order.getName()); preparedStatement.setString(3, order.getType()); preparedStatement.setString(4, order.getState().name()); - preparedStatement.setDate(5, new Date(order.getDate().getTime()), Calendar.getInstance()); + preparedStatement.setTimestamp(5, new Timestamp(order.getDate().getTime()), Calendar.getInstance()); SQLXML sqlxml = createSqlXml(order, preparedStatement); preparedStatement.setSQLXML(6, sqlxml); @@ -137,7 +137,7 @@ public class PostgreSqlOrderDao extends PostgresqlDao implements OrderDao preparedStatement.setString(1, order.getName()); preparedStatement.setString(2, order.getType()); preparedStatement.setString(3, order.getState().name()); - preparedStatement.setDate(4, new Date(order.getDate().getTime()), Calendar.getInstance()); + preparedStatement.setTimestamp(4, new Timestamp(order.getDate().getTime()), Calendar.getInstance()); preparedStatement.setString(6, order.getId()); SQLXML sqlxml = createSqlXml(order, preparedStatement);