additionally support oracle
diff --git a/db/oracle/create_db.sql b/db/oracle/create_db.sql
index c8932bd..c653cc5 100644
--- a/db/oracle/create_db.sql
+++ b/db/oracle/create_db.sql
@@ -172,7 +172,7 @@
FOR EACH ROW
WHEN (new."incident_id" IS NULL) BEGIN
SELECT TBL_NOTIFICATION_INCIDENT_SEQ.NEXTVAL
- INTO :new."id"
+ INTO :new."incident_id"
FROM dual;
END;
/
diff --git a/deploy/conf/context.xml b/deploy/conf/context.xml
index 237a658..63f4bde 100644
--- a/deploy/conf/context.xml
+++ b/deploy/conf/context.xml
@@ -39,6 +39,14 @@
username="btbservice"
password="btbservice"/>
+ <Resource name="jdbc/okBetriebstagebuchDSO"
+ auth="Container"
+ type="javax.sql.DataSource"
+ driverClassName="oracle.jdbc.driver.OracleDriver"
+ url="jdbc:oracle:thin:@LIDLORADB2.PTA.DE:1521:NAPDB00"
+ username="DIETRICF"
+ password="dietricf000"/>
+
<!-- Uncomment this to enable Comet connection tacking (provides events
on session expiration as well as webapp lifecycle) -->
diff --git a/deploy/lib/ojdbc7_g.jar b/deploy/lib/ojdbc7_g.jar
new file mode 100644
index 0000000..782074c
--- /dev/null
+++ b/deploy/lib/ojdbc7_g.jar
Binary files differ
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/dao/EntityHelper.java b/src/main/java/org/eclipse/openk/elogbook/persistence/dao/EntityHelper.java
index 16c0580..4c69261 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/dao/EntityHelper.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/dao/EntityHelper.java
@@ -4,7 +4,7 @@
import javax.persistence.Persistence;
public class EntityHelper {
- private static final String FACTORY_NAME = "betriebstagebuch";
+ private static final String FACTORY_NAME = "betriebstagebuchORA";
private static EntityManagerFactory entityManagerFactory;
private EntityHelper() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/dao/TblNotificationDao.java b/src/main/java/org/eclipse/openk/elogbook/persistence/dao/TblNotificationDao.java
index d0913c7..13d5845 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/dao/TblNotificationDao.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/dao/TblNotificationDao.java
@@ -1,11 +1,5 @@
package org.eclipse.openk.elogbook.persistence.dao;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-
import org.eclipse.openk.elogbook.common.NotificationStatus;
import org.eclipse.openk.elogbook.exceptions.BtbException;
import org.eclipse.openk.elogbook.exceptions.BtbInternalServerError;
@@ -18,6 +12,12 @@
import org.eclipse.openk.elogbook.viewmodel.NotificationSearchFilter;
import org.eclipse.openk.elogbook.viewmodel.ReminderSearchFilter;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+
public class TblNotificationDao extends GenericDaoJpa<TblNotification, Integer> {
public TblNotificationDao() {
@@ -73,7 +73,7 @@
Query q = queryCreator.generateNotificationQuery(nsf, whereClause, listType, tblResponsibilities);
return refreshModelCollection((List<TblNotification>) q.getResultList());
} catch (Exception e) {
- LOGGER.error("Error retrieving notifications", e);
+ LOGGER.error("Error while retrieving notifications", e);
throw new BtbInternalServerError("Error retrieving notifications");
}
}
@@ -88,15 +88,15 @@
Query q = queryCreator.generateNotificationQueryWithReminder(rsf, whereClause, tblResponsibilities);
return refreshModelCollection((List<TblNotification>) q.getResultList());
} catch (Exception e) {
- LOGGER.error("Error retrieving notifications", e);
- throw new BtbInternalServerError("Error retrieving notifications");
+ LOGGER.error("Error while retrieving notifications with reminder", e);
+ throw new BtbInternalServerError("Error retrieving notifications with reminder");
}
}
public List<TblNotification> getNotificationsWithReminder(ReminderSearchFilter rsf, List<TblResponsibility> tblResponsibilities) throws BtbInternalServerError {
try {
- String where = "v.fk_ref_notification_status IN ( " + NotificationStatus.OPEN.id + "," + NotificationStatus.INPROGRESS.id + " ) ";
+ String where = "v.\"fk_ref_notification_status\" IN ( " + NotificationStatus.OPEN.id + "," + NotificationStatus.INPROGRESS.id + " ) ";
return refreshModelCollection(getActiveNotificationsWithReminder(rsf, where, "v", tblResponsibilities));
} catch (Exception t) {
LOGGER.error(t);
@@ -113,7 +113,7 @@
*/
public List<TblNotification> getPastNotifications(NotificationSearchFilter nsf,
List<TblResponsibility> tblResponsibilities) throws BtbInternalServerError {
- String where = "v.fk_ref_notification_status IN ( " + NotificationStatus.CLOSED.id + " ) ";
+ String where = "v.\"fk_ref_notification_status\" IN ( " + NotificationStatus.CLOSED.id + " ) ";
return refreshModelCollection(getActiveNotifications(nsf, where, "v", ListType.PAST, tblResponsibilities));
}
@@ -127,16 +127,17 @@
*/
public List<TblNotification> getOpenNotifications(NotificationSearchFilter notificationSearchFilter,
List<TblResponsibility> tblResponsibilities) throws BtbInternalServerError {
- String where = "v.fk_ref_notification_status IN (" + NotificationStatus.OPEN.id + ","
+ String where = "v.\"fk_ref_notification_status\" IN (" + NotificationStatus.OPEN.id + ","
+ NotificationStatus.INPROGRESS.id + ","
- + NotificationStatus.FINISHED.id+ ")" + " AND v.begin_date < (TIMESTAMP 'tomorrow')";
+ + NotificationStatus.FINISHED.id+ ")";
+ notificationSearchFilter.setDateTo( new Timestamp(System.currentTimeMillis() + 1000 * 60 * 60 * 24));
return refreshModelCollection(
getActiveNotifications(notificationSearchFilter, where, "v", ListType.OPEN, tblResponsibilities));
}
public List<TblNotification> getFutureNotifications(NotificationSearchFilter nsf,
List<TblResponsibility> tblResponsibilities) throws BtbInternalServerError {
- String where = "v.fk_ref_notification_status NOT IN (" + NotificationStatus.CLOSED.id + ","
+ String where = "v.\"fk_ref_notification_status\" NOT IN (" + NotificationStatus.CLOSED.id + ","
+ NotificationStatus.FINISHED.id + ")";
return refreshModelCollection(getActiveNotifications(nsf, where, "v", ListType.FUTURE, tblResponsibilities));
}
@@ -145,13 +146,13 @@
@SuppressWarnings("unchecked")
public List<TblNotification> getByIncidentId(int incidentId) throws BtbInternalServerError {
try {
- String selectString = "select * from tbl_notification n where n.incident_id=? order by n.version desc";
+ String selectString = "select * from \"TBL_NOTIFICATION\" n where n.\"incident_id\"=? order by n.\"version\" desc";
Query q = getEM().createNativeQuery(selectString, TblNotification.class);
q.setParameter(1, incidentId);
return refreshModelCollection(q.getResultList());
} catch (Exception t) {
LOGGER.error(t);
- throw new BtbInternalServerError("Error loading notifications");
+ throw new BtbInternalServerError("Error loading notifications by incidentId");
}
}
@@ -159,7 +160,7 @@
public List<String> getAssignedUserSuggestions() throws BtbInternalServerError {
try {
- String selectString = "select distinct responsibility_forwarding from view_active_notification n where n.responsibility_forwarding is not null";
+ String selectString = "select distinct \"responsibility_forwarding\" from \"view_active_notification\" n where n.\"responsibility_forwarding\" is not null";
Query q = getEM().createNativeQuery(selectString);
return q.getResultList();
} catch (Exception t) {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
index 3356b48..79fdccb 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/AbstractNotification.java
@@ -1,17 +1,9 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.MappedSuperclass;
-import javax.persistence.SequenceGenerator;
-
/**
* The persistent class for the tbl_notification database table.
@@ -24,69 +16,69 @@
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TBL_NOTIFICATION_ID_SEQ")
@SequenceGenerator(name = "TBL_NOTIFICATION_ID_SEQ", sequenceName = "TBL_NOTIFICATION_ID_SEQ", allocationSize = 1)
- @Column(name = "id", updatable = false)
+ @Column(name = "\"id\"", updatable = false)
private Integer id;
- @Column(name = "incident_id")
+ @Column(name = "\"incident_id\"")
private Integer incidentId;
- @Column(name="begin_date")
+ @Column(name="\"begin_date\"")
private Timestamp beginDate;
- @Column(name="create_date")
+ @Column(name="\"create_date\"")
private Timestamp createDate;
- @Column(name="create_user")
+ @Column(name="\"create_user\"")
private String createUser;
- @Column(name="expected_finished_date")
+ @Column(name="\"expected_finished_date\"")
private Timestamp expectedFinishedDate;
- @Column(name="finished_date")
+ @Column(name="\"finished_date\"")
private Timestamp finishedDate;
- @Column(name="free_text")
+ @Column(name="\"free_text\"")
private String freeText;
- @Column(name="free_text_extended")
+ @Column(name="\"free_text_extended\"")
private String freeTextExtended;
- @Column(name="mod_date")
+ @Column(name="\"mod_date\"")
private Timestamp modDate;
- @Column(name="mod_user")
+ @Column(name="\"mod_user\"")
private String modUser;
- @Column(name="notification_text")
+ @Column(name="\"notification_text\"")
private String notificationText;
- @Column(name="reminder_date")
+ @Column(name="\"reminder_date\"")
private Timestamp reminderDate;
- @Column(name="responsibility_control_point")
+ @Column(name="\"responsibility_control_point\"")
private String responsibilityControlPoint;
- @Column(name="responsibility_forwarding")
+ @Column(name="\"responsibility_forwarding\"")
private String responsibilityForwarding;
- @Column(name="version")
+ @Column(name="\"version\"")
private Integer version;
- @Column(name="admin_flag")
+ @Column(name="\"admin_flag\"")
private Boolean adminFlag;
//bi-directional many-to-one association to RefBranch
@ManyToOne
- @JoinColumn(name="fk_ref_branch")
+ @JoinColumn(name="\"fk_ref_branch\"")
private RefBranch refBranch;
//bi-directional many-to-one association to RefNotificationStatus
@ManyToOne
- @JoinColumn(name="fk_ref_notification_status")
+ @JoinColumn(name="\"fk_ref_notification_status\"")
private RefNotificationStatus refNotificationStatus;
@ManyToOne
- @JoinColumn(name="fk_ref_grid_territory")
+ @JoinColumn(name="\"fk_ref_grid_territory\"")
private RefGridTerritory refGridTerritory;
public AbstractNotification() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/HTblResponsibility.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/HTblResponsibility.java
index 3dcfc2a..7a3f26e 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/HTblResponsibility.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/HTblResponsibility.java
@@ -1,18 +1,8 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
/**
@@ -20,7 +10,7 @@
*
*/
@Entity
-@Table(name="htbl_responsibility")
+@Table(name="\"HTBL_RESPONSIBILITY\"")
@NamedQueries ({
@NamedQuery(name="HTblResponsibility.findAll", query="SELECT t FROM HTblResponsibility t"),
})
@@ -30,41 +20,41 @@
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "HTBL_RESPONSIBILITY_ID_SEQ")
@SequenceGenerator(name = "HTBL_RESPONSIBILITY_ID_SEQ", sequenceName = "HTBL_RESPONSIBILITY_ID_SEQ", allocationSize = 1)
- @Column(name = "id", updatable = false)
+ @Column(name = "\"id\"", updatable = false)
private Integer id;
- @Column(name="responsible_user")
+ @Column(name="\"responsible_user\"")
private String responsibleUser;
- @Column(name="former_responsible_user")
+ @Column(name="\"former_responsible_user\"")
private String formerResponsibleUser;
- @Column(name="transfer_date")
+ @Column(name="\"transfer_date\"")
private Timestamp transferDate;
- @Column(name = "transaction_id")
+ @Column(name = "\"transaction_id\"")
private Integer transactionId;
- @Column(name="create_date")
+ @Column(name="\"create_date\"")
private Timestamp createDate;
- @Column(name="create_user")
+ @Column(name="\"create_user\"")
private String createUser;
- @Column(name="mod_date")
+ @Column(name="\"mod_date\"")
private Timestamp modDate;
- @Column(name="mod_user")
+ @Column(name="\"mod_user\"")
private String modUser;
//bi-directional many-to-one association to RefGridTerritory
@ManyToOne
- @JoinColumn(name="fk_ref_grid_territory")
+ @JoinColumn(name="\"fk_ref_grid_territory\"")
private RefGridTerritory refGridTerritory;
//bi-directional many-to-one association to RefBranch
@ManyToOne
- @JoinColumn(name="fk_ref_branch")
+ @JoinColumn(name="\"fk_ref_branch\"")
private RefBranch refBranch;
public HTblResponsibility() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefBranch.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefBranch.java
index b66cae7..9b4c407 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefBranch.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefBranch.java
@@ -1,14 +1,8 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
/**
@@ -16,18 +10,20 @@
*
*/
@Entity
-@Table(name="ref_branch")
+@Table(name="\"REF_BRANCH\"")
@NamedQuery(name="RefBranch.findAll", query="SELECT r FROM RefBranch r")
public class RefBranch implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
+ @Column(name = "\"id\"")
private Integer id;
+ @Column(name = "\"name\"")
private String name;
+ @Column(name = "\"description\"")
private String description;
public RefBranch() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefGridTerritory.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefGridTerritory.java
index 8568809..4c4578d 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefGridTerritory.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefGridTerritory.java
@@ -1,15 +1,7 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
/**
@@ -17,25 +9,27 @@
*
*/
@Entity
-@Table(name="ref_grid_territory")
+@Table(name="\"REF_GRID_TERRITORY\"")
@NamedQuery(name="RefGridTerritory.findAll", query="SELECT r FROM RefGridTerritory r")
public class RefGridTerritory implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
+ @Column(name = "\"id\"")
private Integer id;
@ManyToOne
- @JoinColumn(name="fk_ref_master")
+ @JoinColumn(name="\"fk_ref_master\"")
private RefGridTerritory refMaster;
- @Column(name = "fk_ref_master", nullable = false, updatable = false, insertable = false)
+ @Column(name = "\"fk_ref_master\"", nullable = false, updatable = false, insertable = false)
private Integer fkRefMaster;
+ @Column(name = "\"description\"")
private String description;
+ @Column(name = "\"name\"")
private String name;
public RefGridTerritory() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefNotificationStatus.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefNotificationStatus.java
index 3a328b3..51e5f53 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefNotificationStatus.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefNotificationStatus.java
@@ -1,13 +1,7 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
/**
@@ -15,16 +9,17 @@
*
*/
@Entity
-@Table(name="ref_notification_status", schema = "public")
+@Table(name="\"REF_NOTIFICATION_STATUS\"")
@NamedQuery(name="RefNotificationStatus.findAll", query="SELECT r FROM RefNotificationStatus r")
public class RefNotificationStatus implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
+ @Column(name = "\"id\"")
private Integer id;
+ @Column(name = "\"name\"")
private String name;
public RefNotificationStatus() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefVersion.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefVersion.java
index 06f0974..c6b2fa3 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefVersion.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/RefVersion.java
@@ -1,30 +1,24 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
/**
* The persistent class for the "REF_VERSION" database table.
*/
@Entity
-@Table(name = "ref_version", schema = "public")
+@Table(name = "\"REF_VERSION\"")
@NamedQuery(name = "RefVersion.findAll", query = "SELECT r FROM RefVersion r")
public class RefVersion implements Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
+ @Column(name = "\"id\"")
private Integer id;
- @Column(name = "version")
+ @Column(name = "\"version\"")
private String version;
public Integer getId() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblNotification.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblNotification.java
index 9168fb0..dac04e3 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblNotification.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblNotification.java
@@ -9,7 +9,7 @@
*
*/
@Entity
-@Table(name="tbl_notification")
+@Table(name="\"TBL_NOTIFICATION\"")
public class TblNotification extends AbstractNotification {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblResponsibility.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblResponsibility.java
index c91266d..35cc6fb 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblResponsibility.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/TblResponsibility.java
@@ -1,17 +1,8 @@
package org.eclipse.openk.elogbook.persistence.model;
+import javax.persistence.*;
import java.io.Serializable;
import java.sql.Timestamp;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQuery;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
/**
@@ -19,7 +10,7 @@
*
*/
@Entity
-@Table(name="tbl_responsibility")
+@Table(name="\"TBL_RESPONSIBILITY\"")
@NamedQuery(name="TblResponsibility.findAll", query="SELECT t FROM TblResponsibility t")
public class TblResponsibility implements Serializable {
private static final long serialVersionUID = 1L;
@@ -27,35 +18,35 @@
@Id
@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "TBL_RESPONSIBILITY_ID_SEQ")
@SequenceGenerator(name = "TBL_RESPONSIBILITY_ID_SEQ", sequenceName = "TBL_RESPONSIBILITY_ID_SEQ", allocationSize = 1)
- @Column(name = "id", updatable = false)
+ @Column(name = "\"id\"", updatable = false)
private Integer id;
- @Column(name="responsible_user")
+ @Column(name="\"responsible_user\"")
private String responsibleUser;
- @Column(name="new_responsible_user")
+ @Column(name="\"new_responsible_user\"")
private String newResponsibleUser;
- @Column(name="create_date")
+ @Column(name="\"create_date\"")
private Timestamp createDate;
- @Column(name="create_user")
+ @Column(name="\"create_user\"")
private String createUser;
- @Column(name="mod_date")
+ @Column(name="\"mod_date\"")
private Timestamp modDate;
- @Column(name="mod_user")
+ @Column(name="\"mod_user\"")
private String modUser;
//bi-directional many-to-one association to RefGridTerritory
@ManyToOne
- @JoinColumn(name="fk_ref_grid_territory")
+ @JoinColumn(name="\"fk_ref_grid_territory\"")
private RefGridTerritory refGridTerritory;
//bi-directional many-to-one association to RefBranch
@ManyToOne
- @JoinColumn(name="fk_ref_branch")
+ @JoinColumn(name="\"fk_ref_branch\"")
private RefBranch refBranch;
public TblResponsibility() {
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/model/ViewNotification.java b/src/main/java/org/eclipse/openk/elogbook/persistence/model/ViewNotification.java
index 12f47a1..dee28e4 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/model/ViewNotification.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/model/ViewNotification.java
@@ -9,7 +9,7 @@
*
*/
@Entity
-@Table(name="view_active_notification")
+@Table(name="\"VIEW_ACTIVE_NOTIFICATION\"")
public class ViewNotification extends AbstractNotification {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreator.java b/src/main/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreator.java
index 85f68fe..53ce9de 100644
--- a/src/main/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreator.java
+++ b/src/main/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreator.java
@@ -23,10 +23,10 @@
private static final String AND_LIT = " AND ";
private static final String OR_LIT = " OR ";
private static final String ORDER_LIT = " ORDER BY ";
- private static final String FK_BRANCH_EQUAL = "fk_ref_branch = ";
- private static final String FK_GRID_TERRITORY_EQUAL = "fk_ref_grid_territory = ";
- private static final String FK_BRANCH_NULL = "fk_ref_branch IS NULL";
- private static final String FK_GRID_TERRITORY_NULL = "fk_ref_grid_territory IS NULL";
+ private static final String FK_BRANCH_EQUAL = "\"fk_ref_branch\" = ";
+ private static final String FK_GRID_TERRITORY_EQUAL = "\"fk_ref_grid_territory\" = ";
+ private static final String FK_BRANCH_NULL = "\"fk_ref_branch\" IS NULL";
+ private static final String FK_GRID_TERRITORY_NULL = "\"fk_ref_grid_territory\" IS NULL";
private static final String DUMMY_FALSE_VALUE_ORCLAUSE = " false ";
private static final Logger LOGGER = Logger.getLogger(NotificationQueryCreator.class.getName());
@@ -59,7 +59,7 @@
public Query generateNotificationQuery(NotificationSearchFilter notificationSearchFilter, String baseWhereClause,
ListType listType, List<TblResponsibility> tblResponsibilities) {
- StringBuilder sql = new StringBuilder("select * from view_active_notification v where 1=1 ");
+ StringBuilder sql = new StringBuilder("select * from \"VIEW_ACTIVE_NOTIFICATION\" v where 1=1 ");
if (baseWhereClause != null && !baseWhereClause.isEmpty()) {
sql.append(AND_LIT).append(baseWhereClause);
}
@@ -105,14 +105,14 @@
*/
public Query generateFindHistoricalNotificationsByResponsibilityQuery(List<HTblResponsibility> hTblResponsibilities,
ListType listType) {
- StringBuilder sqlSB = new StringBuilder("select * from " + " tbl_notification t1 join ( "
- + " select incident_id, max(version) as version FROM tbl_notification t " + " WHERE ");
+ StringBuilder sqlSB = new StringBuilder("select * from " + " \"TBL_NOTIFICATION\" t1 join ( "
+ + " select \"incident_id\", max(\"version\") as version FROM \"TBL_NOTIFICATION\" t " + " WHERE ");
sqlSB.append("(");
- sqlSB.append(" mod_Date < ? ").append(OR_LIT).append(" mod_Date IS NULL").append(AND_LIT)
- .append("create_Date < ? ");
+ sqlSB.append(" \"mod_Date\" < ? ").append(OR_LIT).append(" \"mod_Date\" IS NULL").append(AND_LIT)
+ .append("\"create_Date\" < ? ");
sqlSB.append(")");
- sqlSB.append(" GROUP BY incident_id");
- sqlSB.append(" ) t2 ON ( t1.incident_id = t2.incident_id AND t1.version = t2.version) where ");
+ sqlSB.append(" GROUP BY \"incident_id\"");
+ sqlSB.append(" ) t2 ON ( t1.\"incident_id\" = t2.\"incident_id\" AND t1.\"version\" = t2.\"version\") where ");
sqlSB.append("(").append(DUMMY_FALSE_VALUE_ORCLAUSE);
for (HTblResponsibility hTblResponsibility : hTblResponsibilities) {
@@ -256,18 +256,18 @@
*/
private void extendFindHistoricalNotificationsByResponsibilityQueryListTypeSpecific(StringBuilder sqlSB,
ListType listType, Timestamp transferDate) {
- sqlSB.append(AND_LIT).append("fk_ref_notification_status ");
+ sqlSB.append(AND_LIT).append("\"fk_ref_notification_status\" ");
switch (listType) {
case PAST:
sqlSB.append("IN ").append("(").append(NotificationStatus.CLOSED.id).append(", ")
- .append(NotificationStatus.FINISHED.id).append(")").append(AND_LIT).append("begin_date <= '")
- .append(transferDate).append("'").append(AND_LIT).append("begin_date > TIMESTAMP '")
+ .append(NotificationStatus.FINISHED.id).append(")").append(AND_LIT).append("\"begin_date\" <= '")
+ .append(transferDate).append("'").append(AND_LIT).append("\"begin_date\" > TIMESTAMP '")
.append(transferDate).append("' - INTERVAL '7 days'");
break;
case OPEN:
sqlSB.append("IN ").append("(").append(NotificationStatus.OPEN.id).append(", ")
.append(NotificationStatus.INPROGRESS.id).append(", ").append(NotificationStatus.FINISHED.id)
- .append(")").append(AND_LIT).append("begin_date < TIMESTAMP '").append(transferDate)
+ .append(")").append(AND_LIT).append("\"begin_date\" < TIMESTAMP '").append(transferDate)
.append("' + INTERVAL '1 day '");
break;
case FUTURE:
@@ -321,13 +321,13 @@
private String extendWhereClauseByDates(NotificationSearchFilter nsf) {
StringBuilder ret = new StringBuilder();
if (nsf.getDateFrom() != null) {
- ret.append(AND_LIT).append(tablePrefix).append("begin_date >= ?");
+ ret.append(AND_LIT).append(tablePrefix).append("\"begin_date\" >= ?");
latebindParamMap.put(iCounter, nsf.getDateFrom());
iCounter++;
}
if (nsf.getDateTo() != null) {
- ret.append(AND_LIT).append(tablePrefix).append("begin_date <= ?");
+ ret.append(AND_LIT).append(tablePrefix).append("\"begin_date\" <= ?");
latebindParamMap.put(iCounter, nsf.getDateTo());
}
return ret.toString();
@@ -336,7 +336,7 @@
private String extendWhereClauseByReminderDate(ReminderSearchFilter rsf) {
StringBuilder ret = new StringBuilder();
if (rsf.getReminderDate() != null) {
- ret.append(AND_LIT).append(tablePrefix).append("reminder_date <= ?");
+ ret.append(AND_LIT).append(tablePrefix).append("\"reminder_date\" <= ?");
latebindParamMap.put(iCounter, rsf.getReminderDate());
}
@@ -394,6 +394,6 @@
}
private String getNotificationOrder() {
- return ORDER_LIT + tablePrefix + "fk_ref_branch ASC, fk_ref_grid_territory ASC, " + tablePrefix + "begin_date";
+ return ORDER_LIT + tablePrefix + "\"fk_ref_branch\" ASC, \"fk_ref_grid_territory\" ASC, " + tablePrefix + "\"begin_date\"";
}
}
\ No newline at end of file
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index f6a4e42..e6cba1c 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -19,4 +19,21 @@
<!--<property name="eclipselink.logging.parameters" value="true"/>-->
</properties>
</persistence-unit>
+ <persistence-unit name="betriebstagebuchORA">
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ <non-jta-data-source>java:comp/env/jdbc/okBetriebstagebuchDSO</non-jta-data-source>
+ <class>org.eclipse.openk.elogbook.persistence.model.RefVersion</class>
+ <class>org.eclipse.openk.elogbook.persistence.model.RefBranch</class>
+ <class>org.eclipse.openk.elogbook.persistence.model.RefGridTerritory</class>
+ <class>org.eclipse.openk.elogbook.persistence.model.RefNotificationStatus</class>
+ <class>org.eclipse.openk.elogbook.persistence.model.TblNotification</class>
+ <class>org.eclipse.openk.elogbook.persistence.model.TblResponsibility</class>
+ <exclude-unlisted-classes>false</exclude-unlisted-classes>
+ <properties>
+ <!--<property name="eclipselink.logging.file" value="../logs/eclipselink.log"/>-->
+ <!--<property name="eclipselink.logging.level" value="FINE" />-->
+ <!--<property name="eclipselink.logging.level.sql" value="FINE"/>-->
+ <!--<property name="eclipselink.logging.parameters" value="true"/>-->
+ </properties>
+ </persistence-unit>
</persistence>
diff --git a/src/test/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreatorTest.java b/src/test/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreatorTest.java
index eef41e1..25d605e 100644
--- a/src/test/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreatorTest.java
+++ b/src/test/java/org/eclipse/openk/elogbook/persistence/util/NotificationQueryCreatorTest.java
@@ -161,7 +161,7 @@
String ret = Whitebox.invokeMethod(queryCreator, "extendWhereClauseApplyingSearchFilter", nsf, ListType.FUTURE,
new ArrayList<TblResponsibility>());
- assertTrue("AND w.begin_date >= ? AND w.begin_date <= ? AND (fk_ref_branch IS NULL AND fk_ref_grid_territory IS NULL)".equalsIgnoreCase(ret.trim()));
+ assertTrue("AND w.\"begin_date\" >= ? AND w.\"begin_date\" <= ? AND (\"fk_ref_branch\" IS NULL AND \"fk_ref_grid_territory\" IS NULL)".equalsIgnoreCase(ret.trim()));
}
/**
@@ -181,7 +181,7 @@
tblResponsibilities.add(createTblResponsibility(1, 1, 1, 1));
String ret = Whitebox.invokeMethod(queryCreator, "extendWhereClauseApplyingSearchFilter", nsf, ListType.PAST,
tblResponsibilities);
- assertTrue(" AND w.begin_date >= ? AND w.begin_date <= ? AND (fk_ref_branch IS NULL AND fk_ref_grid_territory IS NULL OR ((fk_ref_branch IS NULL OR fk_ref_branch = 1) AND (fk_ref_grid_territory IS NULL OR fk_ref_grid_territory = 1)))".equals(ret));
+ assertTrue(" AND w.\"begin_date\" >= ? AND w.\"begin_date\" <= ? AND (\"fk_ref_branch\" IS NULL AND \"fk_ref_grid_territory\" IS NULL OR ((\"fk_ref_branch\" IS NULL OR \"fk_ref_branch\" = 1) AND (\"fk_ref_grid_territory\" IS NULL OR \"fk_ref_grid_territory\" = 1)))".equals(ret));
}
/**
@@ -197,7 +197,7 @@
String ret = Whitebox.invokeMethod(queryCreator, "extendWhereClauseApplyingSearchFilter", nsf, ListType.PAST,
new ArrayList<TblResponsibility>());
- assertTrue(" AND w.begin_date >= ? AND w.begin_date <= ? AND (fk_ref_branch IS NULL AND fk_ref_grid_territory IS NULL)".equals(ret));
+ assertTrue(" AND w.\"begin_date\" >= ? AND w.\"begin_date\" <= ? AND (\"fk_ref_branch\" IS NULL AND \"fk_ref_grid_territory\" IS NULL)".equals(ret));
}
/**
@@ -215,10 +215,10 @@
String ret = Whitebox.invokeMethod(queryCreator, "extendWhereClauseApplyingSearchFilter", nsf, ListType.OPEN,
tblResponsibilities);
- StringBuilder sb = new StringBuilder("( AND fk_ref_branch IS NULL AND fk_ref_grid_territory IS NULL OR ");
- sb.append("((fk_ref_branch IS NULL OR fk_ref_branch = 7) AND (fk_ref_grid_territory IS NULL OR fk_ref_grid_territory = 1) OR ")
- .append("(fk_ref_branch IS NULL OR fk_ref_branch = 7) AND (fk_ref_grid_territory IS NULL OR fk_ref_grid_territory = 2) OR ")
- .append("(fk_ref_branch IS NULL OR fk_ref_branch = 7) AND (fk_ref_grid_territory IS NULL OR fk_ref_grid_territory = 2)))");
+ StringBuilder sb = new StringBuilder("( AND \"fk_ref_branch\" IS NULL AND \"fk_ref_grid_territory\" IS NULL OR ");
+ sb.append("((\"fk_ref_branch\" IS NULL OR \"fk_ref_branch\" = 7) AND (\"fk_ref_grid_territory\" IS NULL OR \"fk_ref_grid_territory\" = 1) OR ")
+ .append("(\"fk_ref_branch\" IS NULL OR \"fk_ref_branch\" = 7) AND (\"fk_ref_grid_territory\" IS NULL OR \"fk_ref_grid_territory\" = 2) OR ")
+ .append("(\"fk_ref_branch\" IS NULL OR \"fk_ref_branch\" = 7) AND (\"fk_ref_grid_territory\" IS NULL OR \"fk_ref_grid_territory\" = 2)))");
assertTrue((sb.toString()).length() == ret.length());
}
