EMPIREDB-381 Postgress Sequence Suffix
diff --git a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/db/CarSalesDB.java b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/db/CarSalesDB.java
index 30d32b2..1eeb99b 100644
--- a/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/db/CarSalesDB.java
+++ b/empire-db-examples/empire-db-example-advanced/src/main/java/org/apache/empire/samples/db/advanced/db/CarSalesDB.java
@@ -176,7 +176,7 @@
super("MODEL", db);
// ID
- ID = addIdentity ("ID", "MODEL_ID_SEQUENCE"); // Optional Sequence name for some DBMS (e.g. Oracle)
+ ID = addIdentity ("ID", "MODEL_ID_SEQ"); // Optional Sequence name for some DBMS (e.g. Oracle)
NAME = addColumn ("NAME", DataType.VARCHAR, 20, true);
SPECIFICATION = addColumn ("SPECIFICATION", DataType.VARCHAR, 40, true);
WMI = addForeignKey("WMI", db.BRAND, true);
@@ -215,7 +215,7 @@
super("DEALER", db);
// ID
- ID = addIdentity ("ID", "DEALER_ID_SEQUENCE"); // Optional Sequence name for some DBMS (e.g. Oracle)
+ ID = addIdentity ("ID", "DEALER_ID_SEQ"); // Optional Sequence name for some DBMS (e.g. Oracle)
COMPANY_NAME = addColumn ("COMPANY_NAME", DataType.VARCHAR, 40, true);
STREET = addColumn ("ADDRESS", DataType.VARCHAR, 40, false);
CITY = addColumn ("CITY", DataType.VARCHAR, 20, true);
diff --git a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
index 30b2e9f..ad06dc4 100644
--- a/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
+++ b/empire-db-examples/empire-db-example-basic/src/main/java/org/apache/empire/samples/db/SampleDB.java
@@ -93,7 +93,7 @@
{
super("DEPARTMENTS", db);
// ID
- ID = addIdentity ("ID", "DEP_ID_SEQUENCE"); // Optional Sequence for some DBMS (e.g. Oracle)
+ ID = addIdentity ("ID");
NAME = addColumn ("NAME", DataType.VARCHAR, 80, true);
HEAD = addColumn ("HEAD", DataType.VARCHAR, 80, false);
BUSINESS_UNIT = addColumn ("BUSINESS_UNIT", DataType.VARCHAR, 4, true, "ITTK");
@@ -133,7 +133,7 @@
super("EMPLOYEES", db);
// ID
- ID = addIdentity ("ID", "EMPLOYEE_ID_SEQUENCE"); // Optional Sequence name for some DBMS (e.g. Oracle)
+ ID = addIdentity ("ID");
SALUTATION = addColumn ("SALUTATION", DataType.VARCHAR, 5, false);
FIRST_NAME = addColumn ("FIRST_NAME", DataType.VARCHAR, 40, true);
LAST_NAME = addColumn ("LAST_NAME", DataType.VARCHAR, 40, true);
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBTable.java b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
index d1f51a8..0334c2f 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBTable.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBTable.java
@@ -433,6 +433,17 @@
}
/**
+ * Adds an Identity column to the table which also serves as the PrimaryKey
+ * An Identity Column is always an auto-generated Integer(Long) value
+ * @param name the name of the identity column
+ * @return the Identity column
+ */
+ public final DBTableColumn addIdentity(String name)
+ {
+ return addIdentity(name, null);
+ }
+
+ /**
* Adds a new ForgeinKey table column the column list
* The foreign table must have a single column foreign key
* @param name the name of the new column
diff --git a/empire-db/src/main/java/org/apache/empire/dbms/DBMSHandlerBase.java b/empire-db/src/main/java/org/apache/empire/dbms/DBMSHandlerBase.java
index 8edaa2d..fc5d358 100644
--- a/empire-db/src/main/java/org/apache/empire/dbms/DBMSHandlerBase.java
+++ b/empire-db/src/main/java/org/apache/empire/dbms/DBMSHandlerBase.java
@@ -83,7 +83,7 @@
protected final Set<String> reservedSQLKeywords;
// Postfix for auto-generated Sequence names
- protected String SEQUENCE_NAME_POSTFIX = "_SEQ";
+ protected String SEQUENCE_NAME_SUFFIX = "_SEQ";
/**
* DBMSCommand
@@ -419,7 +419,7 @@
StringBuilder b = new StringBuilder(column.getRowSet().getName());
b.append("_");
b.append(column.getName());
- b.append(SEQUENCE_NAME_POSTFIX);
+ b.append(SEQUENCE_NAME_SUFFIX);
seqName = b.toString();
// Store as default for later use
column.setDefaultValue(seqName);
diff --git a/empire-db/src/main/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQL.java b/empire-db/src/main/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQL.java
index 9fbe395..396dfec 100644
--- a/empire-db/src/main/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQL.java
+++ b/empire-db/src/main/java/org/apache/empire/dbms/postgresql/DBMSHandlerPostgreSQL.java
@@ -72,8 +72,6 @@
public DBMSHandlerPostgreSQL()
{
setReservedKeywords();
- // Set default Sequencen name Postfix
- SEQUENCE_NAME_POSTFIX = "_SEQUENCE";
}
/**
