You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2019/08/12 19:36:12 UTC
[tomee-tck] branch master updated: update SQL files and make sure
to pre-populate the database also for other specs
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/master by this push:
new b5b9208 update SQL files and make sure to pre-populate the database also for other specs
b5b9208 is described below
commit b5b92086261553ac9953defcb87a69309bf59a8e
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Mon Aug 12 21:32:58 2019 +0200
update SQL files and make sure to pre-populate the database also for other specs
---
pom.xml | 9 +-
.../apache/openejb/tck/util/GeneratePackages.java | 2 +-
src/test/sql/derby/derby.ddl.jbatch-tck.sql | 81 +++++++++++++++
.../sql/derby/derby.ddl.persistence.sprocs.sql | 23 +++++
src/test/sql/derby/derby.ddl.persistence.sql | 112 +++++++++++++++------
src/test/sql/derby/derby.ddl.securityapi.sql | 29 ++++++
src/test/sql/derby/derby.ddl.sprocs.sql | 14 +--
src/test/sql/derby/derby.ddl.sql | 45 ++++++++-
src/test/sql/derby/derby.dml.jpa.sql | 2 +
9 files changed, 272 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index fd312a5..c87fba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,15 +114,14 @@
<version>1.5.10</version>
</dependency>
- <!--
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>jar-to-test</artifactId>
<version>${javaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/dist/com/sun/ts/tests/jdbc/ee/callStmt/callStmt1/callStmt1_appclient_vehicle_client.jar</systemPath>
+ <type>war</type>
+ <systemPath>/Users/jlmonteiro/devs/jeanouii/eclipse/jakartaee-tck/release/JAKARTAEE_BUILD/build_15-Jul-2019/bundle/jakartaeetck/dist/com/sun/ts/tests/jaxrs/ee/resource/webappexception/nomapper/jaxrs_resource_webappexception_nomapper_web.war</systemPath>
</dependency>
- -->
<dependency>
<groupId>com.sun.javaee.tck</groupId>
@@ -641,10 +640,12 @@
<srcFile>src/test/sql/derby/derby.ddl.jacc.sql</srcFile>
<!--<srcFile>src/test/sql/derby/derby.ddl.jbatch-tck.sql</srcFile>-->
<srcFile>src/test/sql/derby/derby.ddl.jstl.sql</srcFile>
- <!--<srcFile>src/test/sql/derby/derby.ddl.persistence.sprocs.sql</srcFile>-->
+ <srcFile>src/test/sql/derby/derby.ddl.persistence.sprocs.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.persistence.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.ddl.securityapi.sql</srcFile>
<srcFile>src/test/sql/derby/derby.ddl.sprocs.sql</srcFile>
<srcFile>src/test/sql/derby/derby.dml.sql</srcFile>
+ <srcFile>src/test/sql/derby/derby.dml.jpa.sql</srcFile>
<srcFile>src/test/sql/derby/derby.dml.jstl.sql</srcFile>
</srcFiles>
</configuration>
diff --git a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
index 058fff2..0816976 100644
--- a/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
+++ b/src/test/java/org/apache/openejb/tck/util/GeneratePackages.java
@@ -33,7 +33,7 @@ public class GeneratePackages {
public void main() throws Exception {
- final File file = new File(System.getProperty("user.dir"), "webprofile.packages");
+ final File file = new File("./tck8-sections.properties");
final Node root = new Node(null, "");
final BufferedReader reader = new BufferedReader(new FileReader(file));
diff --git a/src/test/sql/derby/derby.ddl.jbatch-tck.sql b/src/test/sql/derby/derby.ddl.jbatch-tck.sql
new file mode 100644
index 0000000..7c18cca
--- /dev/null
+++ b/src/test/sql/derby/derby.ddl.jbatch-tck.sql
@@ -0,0 +1,81 @@
+DROP TABLE Numbers;
+DROP TABLE Orders;
+DROP TABLE Inventory;
+
+CREATE TABLE Numbers (
+ item INT,
+ quantity INT
+);
+
+CREATE TABLE Orders (
+ orderID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1) PRIMARY KEY,
+ itemID INT,
+ quantity INT
+);
+
+CREATE TABLE Inventory(
+ itemID INT NOT NULL PRIMARY KEY,
+ quantity INT NOT NULL
+);
+
+INSERT INTO Inventory VALUES (1, 100);
+
+INSERT INTO Numbers
+VALUES (1, 10);
+
+INSERT INTO Numbers
+VALUES (2, 10);
+
+INSERT INTO Numbers
+VALUES (3, 10);
+
+INSERT INTO Numbers
+VALUES (4, 10);
+
+INSERT INTO Numbers
+VALUES (5, 10);
+
+INSERT INTO Numbers
+VALUES (6, 10);
+
+INSERT INTO Numbers
+VALUES (7, 10);
+
+INSERT INTO Numbers
+VALUES (8, 10);
+
+INSERT INTO Numbers
+VALUES (9, 10);
+
+INSERT INTO Numbers
+VALUES (10, 10);
+
+INSERT INTO Numbers
+VALUES (11, 10);
+
+INSERT INTO Numbers
+VALUES (12, 10);
+
+INSERT INTO Numbers
+VALUES (13, 10);
+
+INSERT INTO Numbers
+VALUES (14, 10);
+
+INSERT INTO Numbers
+VALUES (15, 10);
+
+INSERT INTO Numbers
+VALUES (16, 10);
+
+INSERT INTO Numbers
+VALUES (17, 10);
+
+INSERT INTO Numbers
+VALUES (18, 10);
+
+INSERT INTO Numbers
+VALUES (19, 10);
+
+INSERT INTO Numbers
+VALUES (20, 10);
diff --git a/src/test/sql/derby/derby.ddl.persistence.sprocs.sql b/src/test/sql/derby/derby.ddl.persistence.sprocs.sql
new file mode 100644
index 0000000..21b5031
--- /dev/null
+++ b/src/test/sql/derby/derby.ddl.persistence.sprocs.sql
@@ -0,0 +1,23 @@
+DROP PROCEDURE GetEmpOneFirstNameFromOut;
+CREATE PROCEDURE GetEmpOneFirstNameFromOut (out OUT_PARAM VARCHAR(255)) language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpOneFirstNameFromOut' parameter style java;
+
+DROP PROCEDURE GetEmpFirstNameFromOut;
+CREATE PROCEDURE GetEmpFirstNameFromOut (in IN_PARAM INTEGER, out OUT_PARAM VARCHAR(255)) language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpFirstNameFromOut' parameter style java;
+
+DROP PROCEDURE GetEmpLastNameFromInOut;
+CREATE PROCEDURE GetEmpLastNameFromInOut (inout INOUT_PARAM VARCHAR(255)) language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpLastNameFromInOut' parameter style java;
+
+DROP PROCEDURE GetEmpASCFromRS;
+CREATE PROCEDURE GetEmpASCFromRS() language java dynamic result sets 1 external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpASCFromRS' parameter style java;
+
+DROP PROCEDURE GetEmpIdFNameLNameFromRS;
+CREATE PROCEDURE GetEmpIdFNameLNameFromRS (in IN_PARAM INTEGER) language java dynamic result sets 1 external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpIdFNameLNameFromRS' parameter style java;
+
+DROP PROCEDURE GetEmpIdUsingHireDateFromOut;
+CREATE PROCEDURE GetEmpIdUsingHireDateFromOut (in IN_PARAM DATE, out OUT_PARAM INTEGER) language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.GetEmpIdUsingHireDateFromOut' parameter style java;
+
+DROP PROCEDURE UpdateEmpSalaryColumn;
+CREATE PROCEDURE UpdateEmpSalaryColumn() language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.UpdateEmpSalaryColumn' parameter style java;
+
+DROP PROCEDURE DeleteAllEmp;
+CREATE PROCEDURE DeleteAllEmp() language java external name 'com.sun.ts.lib.tests.jpa.storedprocedures.CS_Procs.DeleteAllEmp' parameter style java;
diff --git a/src/test/sql/derby/derby.ddl.persistence.sql b/src/test/sql/derby/derby.ddl.persistence.sql
index 0a84bd9..dd8b228 100644
--- a/src/test/sql/derby/derby.ddl.persistence.sql
+++ b/src/test/sql/derby/derby.ddl.persistence.sql
@@ -46,9 +46,9 @@ ALTER TABLE ORDER2 DROP CONSTRAINT FK2_FOR_ITEM ;
ALTER TABLE ORDER3 DROP CONSTRAINT FK3_FOR_ITEM ;
ALTER TABLE RETAILORDER2 DROP CONSTRAINT FK_FOR_CUST;
ALTER TABLE EMP_MAPKEYCOL DROP CONSTRAINT FK_DEPT1 ;
-
-DROP TABLE OPENJPA_SEQUENCE_TABLE;
-CREATE TABLE OPENJPA_SEQUENCE_TABLE(ID SMALLINT NOT NULL, SEQUENCE_VALUE BIGINT, PRIMARY KEY (ID));
+ALTER TABLE EMP_MAPKEYCOL DROP CONSTRAINT FK_DEPT3 ;
+ALTER TABLE EMP_MAPKEYCOL DROP CONSTRAINT FK_DEPT4 ;
+ALTER TABLE EMP_MAPKEYCOL2 DROP CONSTRAINT FK_DEPT5 ;
DROP TABLE PHONE_TABLE;
CREATE TABLE PHONE_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, AREA VARCHAR(255) , PHONE_NUMBER VARCHAR(255) , FK_FOR_ADDRESS VARCHAR(255) );
@@ -57,7 +57,24 @@ DROP TABLE ADDRESS;
CREATE TABLE ADDRESS ( ID VARCHAR(255) PRIMARY KEY NOT NULL, STREET VARCHAR(255) , CITY VARCHAR(255) , STATE VARCHAR(255) , ZIP VARCHAR(255) );
DROP TABLE CUSTOMER_TABLE;
-CREATE TABLE CUSTOMER_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , COUNTRY VARCHAR(255), CODE VARCHAR(255), FK5_FOR_CUSTOMER_TABLE VARCHAR(255) , FK6_FOR_CUSTOMER_TABLE VARCHAR(255));
+CREATE TABLE CUSTOMER_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255), COUNTRY VARCHAR(255), CODE VARCHAR(255), FK5_FOR_CUSTOMER_TABLE VARCHAR(255) , FK6_FOR_CUSTOMER_TABLE VARCHAR(255));
+
+ALTER TABLE PHONES DROP CONSTRAINT FK_FOR_PHONES ;
+ALTER TABLE EMPLOYEES DROP CONSTRAINT FK_FOR_EMPLOYEES ;
+
+DROP TABLE CUST_TABLE;
+CREATE TABLE CUST_TABLE ( CUST_ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255), COUNTRY VARCHAR(255), CODE VARCHAR(255));
+
+DROP TABLE PHONES;
+CREATE TABLE PHONES (ID VARCHAR(255), PHONE_NUMBER VARCHAR(255), FK_FOR_PHONES VARCHAR(255));
+ALTER TABLE PHONES ADD CONSTRAINT FK_FOR_PHONES FOREIGN KEY (FK_FOR_PHONES) REFERENCES CUST_TABLE (CUST_ID) ;
+
+DROP TABLE EMPLOYEES ;
+CREATE TABLE EMPLOYEES (ID VARCHAR(255), LASTNAMEEMPLOYEES VARCHAR(255), FK_FOR_EMPLOYEES VARCHAR(255));
+ALTER TABLE EMPLOYEES ADD CONSTRAINT FK_FOR_EMPLOYEES FOREIGN KEY (FK_FOR_EMPLOYEES) REFERENCES CUST_TABLE (CUST_ID) ;
+
+DROP TABLE TRIM_TABLE;
+CREATE TABLE TRIM_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME CHAR(30) NOT NULL);
DROP TABLE ALIAS_TABLE;
CREATE TABLE ALIAS_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, ALIAS VARCHAR(255) , FK1_FOR_CUSTOMER_TABLE VARCHAR(255) , FK2_FOR_CUSTOMER_TABLE VARCHAR(255) );
@@ -78,10 +95,13 @@ DROP TABLE PRODUCT_DETAILS;
CREATE TABLE PRODUCT_DETAILS ( ID VARCHAR(255) PRIMARY KEY NOT NULL, WHOUSE VARCHAR(255) , LICENSE_KEY INT);
DROP TABLE PRODUCT_TABLE;
-CREATE TABLE PRODUCT_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , PRICE DOUBLE , QUANTITY INT, PNUM INT , PRODUCT_TYPE VARCHAR(255), INCEPTION DATE, SOLD DATE, MODEL INT, REV DOUBLE);
+CREATE TABLE PRODUCT_TABLE ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , PRICE DOUBLE, QUANTITY INT, PNUM INT, PRODUCT_TYPE VARCHAR(255), INCEPTION DATE, SOLD DATE, MODEL INT, REV DOUBLE);
+
+DROP TABLE PRODUCT_TABLE_DISCRIMINATOR;
+CREATE TABLE PRODUCT_TABLE_DISCRIMINATOR ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255), QUANTITY INT, PNUM INT, PRICE DOUBLE, PRODUCT_TYPE INT);
DROP TABLE PRICED_PRODUCT_TABLE ;
-CREATE TABLE PRICED_PRODUCT_TABLE (ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255), PRICE DOUBLE , QUANTITY INT, PNUM INT ) ;
+CREATE TABLE PRICED_PRODUCT_TABLE (ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255), PRICE DOUBLE, QUANTITY INT, PNUM INT) ;
DROP table INFO_TABLE ;
CREATE TABLE INFO_TABLE (ID VARCHAR(255) PRIMARY KEY NOT NULL, INFOSTREET VARCHAR(255), INFOCITY VARCHAR(255), INFOSTATE VARCHAR(255), INFOZIP VARCHAR(255), FK_FOR_SPOUSE_TABLE VARCHAR(255) ) ;
@@ -129,7 +149,7 @@ ALTER TABLE SPOUSE_TABLE add constraint FK_INFOTAB Foreign Key (FK_FOR_INFO_TABL
ALTER TABLE INFO_TABLE add constraint FK_SPOUSETAB Foreign Key (FK_FOR_SPOUSE_TABLE) references SPOUSE_TABLE(ID) ;
DROP TABLE EMPLOYEE;
-CREATE TABLE EMPLOYEE (ID INT NOT NULL, FIRSTNAME VARCHAR(255) , LASTNAME VARCHAR(255), HIREDATE DATE, SALARY REAL NOT NULL, STATUS VARCHAR(255) , FK_MGR INT, FK_DEPT INT, FK_PROJECT INT , FK_INS INT, CONSTRAINT PK_EMPLOYEE PRIMARY KEY (ID)) ;
+CREATE TABLE EMPLOYEE (ID INT NOT NULL, FIRSTNAME VARCHAR(255) , LASTNAME VARCHAR(255), HIREDATE DATE, SALARY REAL NOT NULL, STATUS VARCHAR(255), THEORDERCOLUMN INT, EMPLOYEES_ORDER INT, FK_MGR INT, FK_DEPT INT, FK_PROJECT INT , FK_INS INT, CONSTRAINT PK_EMPLOYEE PRIMARY KEY (ID)) ;
DROP TABLE DEPARTMENT ;
CREATE TABLE DEPARTMENT (NAME VARCHAR(255) , ID INT NOT NULL, COMPANY_COMPANYID INT, CONSTRAINT PK_DEPARTMENT PRIMARY KEY (ID)) ;
@@ -153,6 +173,9 @@ ALTER TABLE COMPANY ADD CONSTRAINT FK_ADDRESS FOREIGN KEY (ADDRESS_ID) REFERENCE
ALTER TABLE DEPARTMENT ADD CONSTRAINT FK_COMPANY FOREIGN KEY (COMPANY_COMPANYID) REFERENCES COMPANY (COMPANYID) ;
+DROP TABLE DEPARTMENT2 ;
+CREATE TABLE DEPARTMENT2 (ID INT NOT NULL, NAME VARCHAR(255), CONSTRAINT PK_DEPARTMENT2 PRIMARY KEY (ID)) ;
+
DROP TABLE TEAM;
CREATE TABLE TEAM (NAME VARCHAR(255) NOT NULL, TEAMID INT NOT NULL, COMPANY_COMPANYID INT, CONSTRAINT PK_TEAM PRIMARY KEY (TEAMID));
@@ -204,9 +227,18 @@ CREATE TABLE BEJB_1X1_BI_BTOB ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VAR
DROP TABLE AEJB_1X1_BI_BTOB;
CREATE TABLE AEJB_1X1_BI_BTOB ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , VALUE DECIMAL(18,0) NOT NULL);
+ALTER TABLE DATES_TABLE DROP CONSTRAINT FK_FOR_DATES_TABLE ;
+
DROP TABLE A_BASIC;
CREATE TABLE A_BASIC ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , VALUE INT, BASICINTEGER INT, BASICSHORT SMALLINT, BASICBIGSHORT SMALLINT, BASICFLOAT FLOAT, BASICBIGFLOAT FLOAT, BASICLONG BIGINT, BASICBIGLONG BIGINT, BASICDOUBLE DOUBLE, BASICBIGDOUBLE DOUBLE, BASICCHAR CHAR, BASICCHARARRAY VARCHAR(448), BASICBIGCHARARRAY VARCHAR(448), BASICBYTEARRAY LONG VARCHAR FOR BIT DATA, BASICBIGBYTEARRAY LONG VARCHAR FOR BIT DATA, BASICBIGINTEGER DECIMAL(18,0), BASICBIGDECIMAL DE [...]
+DROP TABLE DATES_TABLE;
+CREATE TABLE DATES_TABLE (ID VARCHAR(255), DATES VARCHAR(255), FK_FOR_DATES_TABLE VARCHAR(255));
+ALTER TABLE DATES_TABLE ADD CONSTRAINT FK_FOR_DATES_TABLE FOREIGN KEY (FK_FOR_DATES_TABLE) REFERENCES A_BASIC (ID) ;
+
+DROP TABLE DATE_TABLE ;
+CREATE TABLE DATE_TABLE (ID DATE, STRINGVERSION VARCHAR(255)) ;
+
DROP TABLE A_BIGINTEGER;
CREATE TABLE A_BIGINTEGER ( ID VARCHAR(255), NAME VARCHAR(255) , VALUE INT, BASICINTEGER INT, BASICSHORT SMALLINT, BASICBIGSHORT SMALLINT, BASICFLOAT FLOAT, BASICBIGFLOAT FLOAT, BASICLONG BIGINT, BASICBIGLONG BIGINT, BASICDOUBLE DOUBLE, BASICBIGDOUBLE DOUBLE, BASICCHAR CHAR, BASICCHARARRAY VARCHAR(448), BASICBIGCHARARRAY VARCHAR(448), BASICBYTEARRAY LONG VARCHAR FOR BIT DATA, BASICBIGBYTEARRAY LONG VARCHAR FOR BIT DATA, BASICBIGINTEGER DECIMAL(18,0) PRIMARY KEY NOT NULL, BASICBIGDECIMAL [...]
@@ -280,12 +312,10 @@ DROP TABLE ANE_1XM_BI_BTOB;
CREATE TABLE ANE_1XM_BI_BTOB ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , VALUE DECIMAL(18,0) NOT NULL );
DROP TABLE A_ADDRESS;
-CREATE TABLE A_ADDRESS ( A_ID VARCHAR(255) NOT NULL, STREET
-VARCHAR(30), CITY VARCHAR(30), STATE VARCHAR(2), ZIP VARCHAR(255), PLUSFOUR VARCHAR(255) );
+CREATE TABLE A_ADDRESS ( A_ID VARCHAR(255) NOT NULL, STREET VARCHAR(30), CITY VARCHAR(30), STATE VARCHAR(2), ZIP VARCHAR(10) );
DROP TABLE COLTAB_ADDRESS;
-CREATE TABLE COLTAB_ADDRESS ( A_ID VARCHAR(255) NOT NULL,
-STREET VARCHAR(30), CITY VARCHAR(30), STATE VARCHAR(2), ZIP VARCHAR(255) , PLUSFOUR VARCHAR(255) );
+CREATE TABLE COLTAB_ADDRESS ( A_ID VARCHAR(255) NOT NULL, STREET VARCHAR(30), CITY VARCHAR(30), STATE VARCHAR(2), ZIP VARCHAR(10) );
DROP TABLE AEC;
CREATE TABLE AEC ( ID VARCHAR(255) PRIMARY KEY NOT NULL, NAME VARCHAR(255) , VALUE DECIMAL(18,0) );
@@ -517,34 +547,40 @@ DROP TABLE PKEY;
CREATE TABLE PKEY ( PMIDINTEGER INT NOT NULL, PMIDSTRING VARCHAR(25) NOT NULL, PMIDFLOAT REAL NOT NULL, BRANDNAME VARCHAR(25) , PRICE REAL , CONSTRAINT PK_PKEY PRIMARY KEY (PMIDINTEGER, PMIDSTRING, PMIDFLOAT));
DROP TABLE DATATYPES;
-CREATE TABLE DATATYPES ( BOOLEANDATA SMALLINT, CHARDATA CHAR, SHORTDATA SMALLINT, INTDATA INT, LONGDATA BIGINT, DBLDATA DOUBLE, FLOATDATA FLOAT, ID INT NOT NULL, ENUMODATA INT, ENUMSDATA VARCHAR(25), BYTEDATA SMALLINT, CONSTRAINT PK_DATATYPES PRIMARY KEY (ID));
+CREATE TABLE DATATYPES ( ID INT NOT NULL, BOOLEANDATA SMALLINT, CHARDATA CHAR, SHORTDATA SMALLINT, INTDATA INT, INTDATA2 INT, LONGDATA BIGINT, DBLDATA DOUBLE, FLOATDATA FLOAT, ENUMODATA INT, ENUMSDATA VARCHAR(25), BYTEDATA SMALLINT, TRANS SMALLINT , BYTEARRAYDATA BLOB(6M), CHARARRAYDATA VARCHAR(448), CONSTRAINT PK_DATATYPES PRIMARY KEY (ID));
DROP TABLE DATATYPES2;
-CREATE TABLE DATATYPES2 ( DATATYPES2_ID DATE NOT NULL, TIMEDATA TIME, TSDATA TIMESTAMP, BYTEDATA BLOB(6M), CHARDATA VARCHAR(448), CONSTRAINT PK_DATATYPES2 PRIMARY KEY (DATATYPES2_ID));
+CREATE TABLE DATATYPES2 ( DATATYPES2_ID DATE NOT NULL, DATEDATA DATE, TIMEDATA TIME, TSDATA TIMESTAMP, CONSTRAINT PK_DATATYPES2 PRIMARY KEY (DATATYPES2_ID));
+
+DROP TABLE DATATYPES3;
+CREATE TABLE DATATYPES3 ( ID DECIMAL(18,0) NOT NULL, THEVALUE DECIMAL(18,0), CONSTRAINT PK_DATATYPES3 PRIMARY KEY (ID));
DROP TABLE PURCHASE_ORDER;
-CREATE TABLE PURCHASE_ORDER (ID INT NOT NULL, TOTAL INT, CONSTRAINT PK_PURCHASE_ORDER PRIMARY KEY (ID));
+CREATE TABLE PURCHASE_ORDER (ID INT NOT NULL, TOTAL INT, DESCRIPTION VARCHAR(50), CONSTRAINT PK_PURCHASE_ORDER PRIMARY KEY (ID));
DROP TABLE GENERATOR_TABLE;
CREATE TABLE GENERATOR_TABLE (PK_COL VARCHAR(10), VAL_COL INT, CONSTRAINT GENERATOR_TABLE_PK PRIMARY KEY (PK_COL) );
INSERT into GENERATOR_TABLE(PK_COL, VAL_COL) values ('DT_ID', 1) ;
+INSERT into GENERATOR_TABLE(PK_COL, VAL_COL) values ('DT1_ID', 1) ;
+INSERT into GENERATOR_TABLE(PK_COL, VAL_COL) values ('DT2_ID', 100) ;
+INSERT into GENERATOR_TABLE(PK_COL, VAL_COL) values ('DT3_ID', 1000) ;
DROP TABLE SEQUENCE;
CREATE TABLE SEQUENCE (SEQ_NAME VARCHAR(10), SEQ_COUNT INT, CONSTRAINT SEQUENCE_PK PRIMARY KEY (SEQ_NAME) );
INSERT into SEQUENCE(SEQ_NAME, SEQ_COUNT) values ('SEQ_GEN', 0) ;
DROP TABLE ORDER1;
-CREATE TABLE ORDER1 (ID VARCHAR(255) NOT NULL PRIMARY KEY, TOTALPRICE DOUBLE , FK1_FOR_ITEM VARCHAR(255));
+CREATE TABLE ORDER1 (ID INT PRIMARY KEY NOT NULL, TOTALPRICE DOUBLE , FK1_FOR_ITEM INT);
DROP TABLE ORDER2;
-CREATE TABLE ORDER2 (ID VARCHAR(255) NOT NULL PRIMARY KEY, TOTALPRICE DOUBLE , FK2_FOR_ITEM VARCHAR(255));
+CREATE TABLE ORDER2 (ID INT PRIMARY KEY NOT NULL, TOTALPRICE DOUBLE , FK2_FOR_ITEM INT);
DROP TABLE ORDER3;
-CREATE TABLE ORDER3 (ID VARCHAR(255) NOT NULL PRIMARY KEY, TOTALPRICE DOUBLE , FK3_FOR_ITEM VARCHAR(255));
+CREATE TABLE ORDER3 (ID INT PRIMARY KEY NOT NULL, TOTALPRICE DOUBLE , FK3_FOR_ITEM INT);
DROP TABLE ITEM ;
-CREATE TABLE ITEM (ID VARCHAR(255) PRIMARY KEY, ITEMNAME VARCHAR(255)) ;
+CREATE TABLE ITEM (ID INT PRIMARY KEY, ITEMNAME VARCHAR(255)) ;
ALTER TABLE ORDER1 add constraint FK1_FOR_ITEM Foreign Key (FK1_FOR_ITEM) references ITEM(ID) ;
ALTER TABLE ORDER2 add constraint FK2_FOR_ITEM Foreign Key (FK2_FOR_ITEM) references ITEM(ID) ;
@@ -775,9 +811,9 @@ ALTER TABLE DID1BDEPENDENT DROP CONSTRAINT DID1BDEPENDENTMPID;
DROP TABLE DID1BDEPENDENT;
DROP TABLE DID1BEMPLOYEE;
-CREATE TABLE DID1BDEPENDENT (NAME VARCHAR(255) NOT NULL, empPK BIGINT, PRIMARY KEY (NAME, empPK));
+CREATE TABLE DID1BDEPENDENT (NAME VARCHAR(255) NOT NULL, EMP_ID BIGINT, PRIMARY KEY (NAME, EMP_ID));
CREATE TABLE DID1BEMPLOYEE (ID BIGINT NOT NULL, NAME VARCHAR(255), PRIMARY KEY (ID));
-ALTER TABLE DID1BDEPENDENT ADD CONSTRAINT DID1BDEPENDENTMPID FOREIGN KEY (empPK) REFERENCES DID1BEMPLOYEE (ID);
+ALTER TABLE DID1BDEPENDENT ADD CONSTRAINT DID1BDEPENDENTMPID FOREIGN KEY (EMP_ID) REFERENCES DID1BEMPLOYEE (ID);
ALTER TABLE DID2DEPENDENT DROP CONSTRAINT DD2DPENDENTFRSTNME;
@@ -825,13 +861,13 @@ CREATE TABLE DID4PERSON (SSN VARCHAR(255) NOT NULL, NAME VARCHAR(255), PRIMARY K
ALTER TABLE DID4MEDICALHISTORY ADD CONSTRAINT DD4MDCLHSTRPTNTSSN FOREIGN KEY (PATIENT_SSN) REFERENCES DID4PERSON (SSN);
---- ALTER TABLE DID4BMEDICALHISTORY DROP CONSTRAINT DD4BMDCLHSTPTNTSSN;
+ALTER TABLE DID4BMEDICALHISTORY DROP CONSTRAINT DD4BMDCLHSTPTNTSSN;
DROP TABLE DID4BMEDICALHISTORY;
DROP TABLE DID4BPERSON;
CREATE TABLE DID4BMEDICALHISTORY (ID VARCHAR(255) NOT NULL, DOCTORNAME VARCHAR(255), PRIMARY KEY (ID));
CREATE TABLE DID4BPERSON (SSN VARCHAR(255) NOT NULL, NAME VARCHAR(255), PRIMARY KEY (SSN));
---- ALTER TABLE DID4BMEDICALHISTORY ADD CONSTRAINT DD4BMDCLHSTPTNTSSN FOREIGN KEY (ID) REFERENCES DID4BPERSON (SSN);
+ALTER TABLE DID4BMEDICALHISTORY ADD CONSTRAINT DD4BMDCLHSTPTNTSSN FOREIGN KEY (ID) REFERENCES DID4BPERSON (SSN);
ALTER TABLE DID5MEDICALHISTORY DROP CONSTRAINT DD5MDCLHSTRYFRSTNM;
@@ -839,26 +875,26 @@ DROP TABLE DID5PERSON;
DROP TABLE DID5MEDICALHISTORY;
CREATE TABLE DID5PERSON (FIRSTNAME VARCHAR(255) NOT NULL, LASTNAME VARCHAR(255) NOT NULL, SSN VARCHAR(255), PRIMARY KEY (FIRSTNAME, LASTNAME));
-CREATE TABLE DID5MEDICALHISTORY (DOCTORNAME VARCHAR(255), PATIENT_FIRSTNAME VARCHAR(255) NOT NULL, PATIENT_LASTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (PATIENT_FIRSTNAME, PATIENT_LASTNAME));
-ALTER TABLE DID5MEDICALHISTORY ADD CONSTRAINT DD5MDCLHSTRYFRSTNM FOREIGN KEY (PATIENT_FIRSTNAME, PATIENT_LASTNAME) REFERENCES DID5PERSON (FIRSTNAME, LASTNAME);
+CREATE TABLE DID5MEDICALHISTORY (DOCTORNAME VARCHAR(255), FIRSTNAME VARCHAR(255) NOT NULL, LASTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (FIRSTNAME, LASTNAME));
+ALTER TABLE DID5MEDICALHISTORY ADD CONSTRAINT DD5MDCLHSTRYFRSTNM FOREIGN KEY (FIRSTNAME, LASTNAME) REFERENCES DID5PERSON (FIRSTNAME, LASTNAME);
---- ALTER TABLE DID5BMEDICALHISTORY DROP CONSTRAINT DD5BMDCLHSTRYLSTNM;
+ALTER TABLE DID5BMEDICALHISTORY DROP CONSTRAINT DD5BMDCLHSTRYLSTNM;
DROP TABLE DID5BMEDICALHISTORY;
DROP TABLE DID5BPERSON;
CREATE TABLE DID5BMEDICALHISTORY (DOCTORNAME VARCHAR(255), LASTNAME VARCHAR(255) NOT NULL, FIRSTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (LASTNAME, FIRSTNAME));
CREATE TABLE DID5BPERSON (LASTNAME VARCHAR(255) NOT NULL, FIRSTNAME VARCHAR(255) NOT NULL, SSN VARCHAR(255), PRIMARY KEY (LASTNAME, FIRSTNAME));
---- ALTER TABLE DID5BMEDICALHISTORY ADD CONSTRAINT DD5BMDCLHSTRYLSTNM FOREIGN KEY (LASTNAME, FIRSTNAME) REFERENCES DID5BPERSON (LASTNAME, FIRSTNAME);
+ALTER TABLE DID5BMEDICALHISTORY ADD CONSTRAINT DD5BMDCLHSTRYLSTNM FOREIGN KEY (LASTNAME, FIRSTNAME) REFERENCES DID5BPERSON (LASTNAME, FIRSTNAME);
ALTER TABLE DID6MEDICALHISTORY DROP CONSTRAINT DD6MDCLHSTRYFRSTNM;
DROP TABLE DID6MEDICALHISTORY;
DROP TABLE DID6PERSON;
-CREATE TABLE DID6MEDICALHISTORY (DOCTORNAME VARCHAR(255), PATIENT_FIRSTNAME VARCHAR(255) NOT NULL, PATIENT_LASTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (PATIENT_FIRSTNAME, PATIENT_LASTNAME));
+CREATE TABLE DID6MEDICALHISTORY (DOCTORNAME VARCHAR(255), FIRSTNAME VARCHAR(255) NOT NULL, LASTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (FIRSTNAME, LASTNAME));
CREATE TABLE DID6PERSON (SSN VARCHAR(255), FIRSTNAME VARCHAR(255) NOT NULL, LASTNAME VARCHAR(255) NOT NULL, PRIMARY KEY (FIRSTNAME, LASTNAME));
-ALTER TABLE DID6MEDICALHISTORY ADD CONSTRAINT DD6MDCLHSTRYFRSTNM FOREIGN KEY (PATIENT_FIRSTNAME, PATIENT_LASTNAME) REFERENCES DID6PERSON (FIRSTNAME, LASTNAME);
+ALTER TABLE DID6MEDICALHISTORY ADD CONSTRAINT DD6MDCLHSTRYFRSTNM FOREIGN KEY (FIRSTNAME, LASTNAME) REFERENCES DID6PERSON (FIRSTNAME, LASTNAME);
ALTER TABLE DID6BMEDICALHISTORY DROP CONSTRAINT DD6BMDCLHSTRYLSTNM;
DROP TABLE DID6BPERSON;
@@ -870,6 +906,22 @@ ALTER TABLE DID6BMEDICALHISTORY ADD CONSTRAINT DD6BMDCLHSTRYLSTNM FOREIGN KEY (L
DROP TABLE EMP_MAPKEYCOL;
-CREATE TABLE EMP_MAPKEYCOL(ID INT NOT NULL, FIRSTNAME VARCHAR(255) , LASTNAME VARCHAR(255), HIREDATE DATE, SALARY REAL NOT NULL, STATUS VARCHAR(255) , FK_MGR INT, FK_DEPT INT, FK_PROJECT INT , FK_INS INT, OFFICE_ID VARCHAR(255), CONSTRAINT PK_EMP PRIMARY KEY (ID)) ;
-
+CREATE TABLE EMP_MAPKEYCOL(ID INT NOT NULL, FIRSTNAME VARCHAR(255) , LASTNAME VARCHAR(255), HIREDATE DATE, SALARY REAL NOT NULL, STATUS VARCHAR(255), FK_MGR INT, FK_DEPT INT, FK_DEPT3 INT, FK_DEPT4 INT, FK_PROJECT INT , FK_INS INT, OFFICE_ID VARCHAR(255), LASTNAMEEMPLOYEES_KEY VARCHAR(255), CONSTRAINT PK_EMP PRIMARY KEY (ID)) ;
ALTER TABLE EMP_MAPKEYCOL ADD CONSTRAINT FK_DEPT1 FOREIGN KEY (FK_DEPT) REFERENCES DEPARTMENT (ID) ;
+ALTER TABLE EMP_MAPKEYCOL ADD CONSTRAINT FK_DEPT3 FOREIGN KEY (FK_DEPT3) REFERENCES DEPARTMENT (ID) ;
+ALTER TABLE EMP_MAPKEYCOL ADD CONSTRAINT FK_DEPT4 FOREIGN KEY (FK_DEPT4) REFERENCES DEPARTMENT (ID) ;
+
+DROP TABLE EMP_MAPKEYCOL2 ;
+CREATE TABLE EMP_MAPKEYCOL2(ID INT NOT NULL, LASTNAME VARCHAR(255), THEDATE DATE ,FK_DEPT5 INT, CONSTRAINT PK_EMP2 PRIMARY KEY (ID)) ;
+ALTER TABLE EMP_MAPKEYCOL2 ADD CONSTRAINT FK_DEPT5 FOREIGN KEY (FK_DEPT5) REFERENCES DEPARTMENT2 (ID) ;
+
+ALTER TABLE COLTAB_EMP_EMBEDED_ADDRESS DROP CONSTRAINT FK_EMPEMBADDRID ;
+DROP TABLE COLTAB_EMP_EMBEDED_ADDRESS;
+DROP TABLE EMPLOYEE_EMBEDED_ADDRESS;
+CREATE TABLE EMPLOYEE_EMBEDED_ADDRESS (ID INTEGER NOT NULL, FIRSTNAME VARCHAR(255), LASTNAME VARCHAR(255), PRIMARY KEY (ID));
+CREATE TABLE COLTAB_EMP_EMBEDED_ADDRESS (ADDRESS_LOCATION VARCHAR(255), STREET VARCHAR(255), STATE VARCHAR(255), ZIP VARCHAR(255), CITY VARCHAR(255), ID VARCHAR(255), EMPEMBADDRID INTEGER);
+ALTER TABLE COLTAB_EMP_EMBEDED_ADDRESS ADD CONSTRAINT FK_EMPEMBADDRID FOREIGN KEY (EMPEMBADDRID) REFERENCES EMPLOYEE_EMBEDED_ADDRESS (ID) ;
+
+
+DROP SEQUENCE SEQGENERATOR RESTRICT;
+CREATE SEQUENCE SEQGENERATOR AS INT START WITH 10;
\ No newline at end of file
diff --git a/src/test/sql/derby/derby.ddl.securityapi.sql b/src/test/sql/derby/derby.ddl.securityapi.sql
new file mode 100644
index 0000000..49ffb7a
--- /dev/null
+++ b/src/test/sql/derby/derby.ddl.securityapi.sql
@@ -0,0 +1,29 @@
+ DROP TABLE caller ;
+ DROP TABLE caller_groups ;
+
+ CREATE TABLE caller(name VARCHAR(64) PRIMARY KEY, password VARCHAR(1024)) ;
+ CREATE TABLE caller_groups(caller_name VARCHAR(64), group_name VARCHAR(64)) ;
+
+ INSERT INTO caller VALUES('tom', 'secret1') ;
+ INSERT INTO caller VALUES('emma', 'secret2') ;
+ INSERT INTO caller VALUES('bob', 'secret3') ;
+ INSERT INTO caller VALUES('tom_hash512_saltsize16', 'PBKDF2WithHmacSHA512:1024:DbjXqT9p8VhJ7OtU6DrqDw==:p/qihG8IZKkz03JzKd6XXA==') ;
+ INSERT INTO caller VALUES('tom_hash256_saltsize32', 'PBKDF2WithHmacSHA256:2048:suVayUIJMQMc6wCgckvAIgKRlo1UkxyFXhXbTxX6C7s=:cvdHkBXVUCN2WL3LRAYodeCdNZxEM4RLlNCCYP68Kmg=') ;
+ INSERT INTO caller VALUES('tom_hash512_saltsize32', 'PBKDF2WithHmacSHA512:2048:dPTjUfiklfyg2bas/KOQKqEfdtoXK8YvbBscIxA8tNg=:ixBg0wr3ySBI86y8HP7+Yw==') ;
+
+ INSERT INTO caller_groups VALUES('tom', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize16', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize16', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash256_saltsize32', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash256_saltsize32', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize32', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize32', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('emma', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('emma', 'Employee') ;
+
+ INSERT INTO caller_groups VALUES('bob', 'Administrator') ;
diff --git a/src/test/sql/derby/derby.ddl.sprocs.sql b/src/test/sql/derby/derby.ddl.sprocs.sql
index d93e10e..e1054cc 100644
--- a/src/test/sql/derby/derby.ddl.sprocs.sql
+++ b/src/test/sql/derby/derby.ddl.sprocs.sql
@@ -14,7 +14,7 @@ drop procedure Real_Proc ;
create procedure Real_Proc (out MAX_PARAM REAL, out MIN_PARAM REAL, out NULL_PARAM DECIMAL(30,15)) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Real_Proc' parameter style java;
drop procedure Bit_Proc ;
-create procedure Bit_Proc (out MAX_PARAM SMALLINT, out MIN_PARAM SMALLINT, out NULL_PARAM DECIMAL(30,15)) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Proc' parameter style java;
+create procedure Bit_Proc (out MAX_PARAM BOOLEAN, out MIN_PARAM BOOLEAN, out NULL_PARAM DECIMAL(30,15)) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Proc' parameter style java;
drop procedure Smallint_Proc ;
create procedure Smallint_Proc (out MAX_PARAM SMALLINT, out MIN_PARAM SMALLINT, out NULL_PARAM DECIMAL(30,15)) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Smallint_Proc' parameter style java;
@@ -122,13 +122,13 @@ drop procedure Real_Io_Null ;
create procedure Real_Io_Null (inout NULL_PARAM REAL) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Real_Io_Null' parameter style java;
drop procedure Bit_Io_Max ;
-create procedure Bit_Io_Max (inout MAX_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Max' parameter style java;
+create procedure Bit_Io_Max (inout MAX_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Max' parameter style java;
drop procedure Bit_Io_Min ;
-create procedure Bit_Io_Min (inout MIN_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Min' parameter style java;
+create procedure Bit_Io_Min (inout MIN_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Min' parameter style java;
drop procedure Bit_Io_Null ;
-create procedure Bit_Io_Null (inout NULL_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Null' parameter style java;
+create procedure Bit_Io_Null (inout NULL_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_Io_Null' parameter style java;
drop procedure Smallint_Io_Max ;
create procedure Smallint_Io_Max (inout MAX_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Smallint_Io_Max' parameter style java;
@@ -257,13 +257,13 @@ drop procedure Real_In_Null ;
create procedure Real_In_Null (in NULL_PARAM REAL) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Real_In_Null' parameter style java;
drop procedure Bit_In_Max ;
-create procedure Bit_In_Max (in MAX_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Max' parameter style java;
+create procedure Bit_In_Max (in MAX_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Max' parameter style java;
drop procedure Bit_In_Min ;
-create procedure Bit_In_Min (in MIN_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Min' parameter style java;
+create procedure Bit_In_Min (in MIN_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Min' parameter style java;
drop procedure Bit_In_Null ;
-create procedure Bit_In_Null (in NULL_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Null' parameter style java;
+create procedure Bit_In_Null (in NULL_PARAM BOOLEAN) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Bit_In_Null' parameter style java;
drop procedure Smallint_In_Max ;
create procedure Smallint_In_Max (in MAX_PARAM SMALLINT) language java external name 'com.sun.ts.lib.tests.jdbc.CS_Procs.Smallint_In_Max' parameter style java;
diff --git a/src/test/sql/derby/derby.ddl.sql b/src/test/sql/derby/derby.ddl.sql
index fc5e649..b2bd297 100644
--- a/src/test/sql/derby/derby.ddl.sql
+++ b/src/test/sql/derby/derby.ddl.sql
@@ -3,6 +3,9 @@ drop table ctstable1 ;
create table ctstable1 (TYPE_ID int NOT NULL, TYPE_DESC varchar(32), primary key(TYPE_ID)) ;
create table ctstable2 (KEY_ID int NOT NULL, COF_NAME varchar(32), PRICE float, TYPE_ID int, primary key(KEY_ID), foreign key(TYPE_ID) references ctstable1) ;
+drop table concurrencetable ;
+create table concurrencetable (TYPE_ID int NOT NULL, TYPE_DESC varchar(32), primary key(TYPE_ID)) ;
+
drop table Numeric_Tab ;
create table Numeric_Tab (MAX_VAL NUMERIC(30,15), MIN_VAL NUMERIC(30,15), NULL_VAL NUMERIC(30,15)) ;
@@ -19,7 +22,7 @@ drop table Real_Tab ;
create table Real_Tab (MAX_VAL REAL, MIN_VAL REAL,NULL_VAL REAL) ;
drop table Bit_Tab ;
-create table Bit_Tab (MAX_VAL SMALLINT, MIN_VAL SMALLINT, NULL_VAL SMALLINT) ;
+create table Bit_Tab (MAX_VAL BOOLEAN, MIN_VAL BOOLEAN, NULL_VAL SMALLINT) ;
drop table Smallint_Tab ;
create table Smallint_Tab (MAX_VAL SMALLINT, MIN_VAL SMALLINT, NULL_VAL SMALLINT) ;
@@ -133,5 +136,41 @@ create table Coffee_FloatPK_Table (KEY_ID FLOAT NOT NULL, BRAND_NAME varchar(32)
drop table Coffee_CompoundPK_Table ;
create table Coffee_CompoundPK_Table (KEY_ID1 int NOT NULL, KEY_ID2 varchar(100) NOT NULL, KEY_ID3 float NOT NULL, BRAND_NAME varchar(32) NOT NULL, PRICE float NOT NULL, primary key(KEY_ID1, KEY_ID2, KEY_ID3)) ;
-drop table COFFEEEJBLITE;
-create table COFFEEEJBLITE (ID INT NOT NULL, BRANDNAME varchar(25), PRICE REAL, CONSTRAINT PK_COFFEEEJBLITE primary key (ID));
+DROP TABLE COFFEEEJBLITE;
+CREATE TABLE COFFEEEJBLITE (ID INT NOT NULL, BRANDNAME VARCHAR(25), PRICE REAL, CONSTRAINT PK_COFFEEEJBLITE PRIMARY KEY (ID));
+
+
+DROP TABLE EJB_AUTOCLOSE_TAB ;
+CREATE TABLE EJB_AUTOCLOSE_TAB (NAME VARCHAR(25) NOT NULL, MESSAGE VARCHAR(25) NOT NULL);
+
+
+DROP TABLE caller ;
+DROP TABLE caller_groups ;
+
+CREATE TABLE caller(name VARCHAR(64) PRIMARY KEY, password VARCHAR(1024)) ;
+CREATE TABLE caller_groups(caller_name VARCHAR(64), group_name VARCHAR(64)) ;
+
+INSERT INTO caller VALUES('tom', 'secret1') ;
+INSERT INTO caller VALUES('emma', 'secret2') ;
+INSERT INTO caller VALUES('bob', 'secret3') ;
+
+INSERT INTO caller_groups VALUES('tom', 'Administrator') ;
+INSERT INTO caller_groups VALUES('tom', 'Manager') ;
+
+INSERT INTO caller_groups VALUES('emma', 'Administrator') ;
+INSERT INTO caller_groups VALUES('emma', 'Employee') ;
+
+INSERT INTO caller_groups VALUES('bob', 'Administrator') ;
+
+ INSERT INTO caller VALUES('tom_hash512_saltsize16', 'PBKDF2WithHmacSHA512:1024:DbjXqT9p8VhJ7OtU6DrqDw==:p/qihG8IZKkz03JzKd6XXA==') ;
+ INSERT INTO caller VALUES('tom_hash256_saltsize32', 'PBKDF2WithHmacSHA256:2048:suVayUIJMQMc6wCgckvAIgKRlo1UkxyFXhXbTxX6C7s=:cvdHkBXVUCN2WL3LRAYodeCdNZxEM4RLlNCCYP68Kmg=') ;
+ INSERT INTO caller VALUES('tom_hash512_saltsize32', 'PBKDF2WithHmacSHA512:2048:dPTjUfiklfyg2bas/KOQKqEfdtoXK8YvbBscIxA8tNg=:ixBg0wr3ySBI86y8HP7+Yw==') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize16', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize16', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash256_saltsize32', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash256_saltsize32', 'Manager') ;
+
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize32', 'Administrator') ;
+ INSERT INTO caller_groups VALUES('tom_hash512_saltsize32', 'Manager') ;
diff --git a/src/test/sql/derby/derby.dml.jpa.sql b/src/test/sql/derby/derby.dml.jpa.sql
new file mode 100644
index 0000000..ed44059
--- /dev/null
+++ b/src/test/sql/derby/derby.dml.jpa.sql
@@ -0,0 +1,2 @@
+Insert_Jpa_Purchase_Order= INSERT INTO PURCHASE_ORDER(ID, TOTAL, DESCRIPTION) VALUES(?, ?, null)
+Select_Jpa_Purchase_Order= SELECT ID, TOTAL FROM PURCHASE_ORDER WHERE ID=?
\ No newline at end of file