Author: clr
Date: Fri Apr 22 12:45:22 2005
New Revision: 164277

URL: http://svn.apache.org/viewcvs?rev=164277&view=rev
Log:
JIRA-23 add DROP TABLE statements

Modified:
    incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
    incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql?rev=164277&r1=164276&r2=164277&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema1.sql Fri Apr 22 12:45:22 
2005
@@ -5,6 +5,12 @@
 -------------------------
 -- mylib
 -------------------------
+
+DROP TABLE PCPoint;
+DROP TABLE PCPoint2;
+DROP TABLE PCRect;
+DROP TABLE PrimitiveTypes;
+
 CREATE TABLE PCPoint (
     ID BIGINT NOT NULL,
     X INTEGER NOT NULL,
@@ -56,6 +62,15 @@
 -- company
 -------------------------
 
+DROP TABLE insuranceplans;
+DROP TABLE project_reviewer;
+DROP TABLE project_member;
+DROP TABLE employee_phoneno_type;
+DROP TABLE persons;
+DROP TABLE projects;
+DROP TABLE departments;
+DROP TABLE companies;
+
 CREATE TABLE companies (
     ID INTEGER NOT NULL,
     NAME VARCHAR(32) NOT NULL,
@@ -133,15 +148,17 @@
     TYPE VARCHAR(16) NOT NULL
 );
 
-ALTER TABLE departments (
+ALTER TABLE departments 
     ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
         (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID)
-);
+;
 
 -------------------------
 --fieldtypes
 -------------------------
 
+DROP TABLE FieldsOfByte;
+
 CREATE TABLE FieldsOfByte (
     IDENTIFIER INTEGER NOT NULL,
     BYTE0 SMALLINT,
@@ -224,6 +241,11 @@
 --inheritance
 -------------------------
 
+DROP TABLE AllPersist;
+DROP TABLE TopNonPersistB;
+DROP TABLE TopPersist;
+DROP TABLE FieldSameName;
+
 CREATE TABLE AllPersist (
     KEY_VALUE INTEGER NOT NULL,
     DOUBLE_B DOUBLE,
@@ -287,6 +309,9 @@
 -------------------------
 --instancecallbacks
 -------------------------
+
+DROP TABLE ICNonPersistFds;
+DROP TABLE InstanceCallbacks;
 
 CREATE TABLE ICNonPersistFds (
     ICKEY INTEGER NOT NULL,

Modified: incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql?rev=164277&r1=164276&r2=164277&view=diff
==============================================================================
--- incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql (original)
+++ incubator/jdo/trunk/tck20/test/sql/derby/schema2.sql Fri Apr 22 12:45:22 
2005
@@ -5,6 +5,12 @@
 -------------------------
 -- mylib
 -------------------------
+
+DROP TABLE PCPoint;
+DROP TABLE PCPoint2;
+DROP TABLE PCRect;
+DROP TABLE PrimitiveTypes;
+
 CREATE TABLE PCPoint (
     ID BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY,
     X INTEGER NOT NULL,
@@ -56,6 +62,15 @@
 -- company
 -------------------------
 
+DROP TABLE insuranceplans;
+DROP TABLE project_reviewer;
+DROP TABLE project_member;
+DROP TABLE employee_phoneno_type;
+DROP TABLE persons;
+DROP TABLE projects;
+DROP TABLE departments;
+DROP TABLE companies;
+
 CREATE TABLE companies (
     ID INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     NAME VARCHAR(32) NOT NULL,
@@ -133,19 +148,104 @@
     type VARCHAR(16) NOT NULL
 );
 
-ALTER TABLE departments (
+ALTER TABLE departments 
     ADD CONSTRAINT EMP_MO_FK FOREIGN KEY
         (EMP_OF_THE_MONTH) REFERENCES persons(PERSONID)
-);
+;
 
 -------------------------
 --fieldtypes
 -------------------------
 
+DROP TABLE FieldsOfByte;
+
+CREATE TABLE FieldsOfByte (
+    IDENTIFIER INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
+    BYTE0 SMALLINT,
+    BYTE1 SMALLINT,
+    BYTE2 SMALLINT,
+    BYTE4 SMALLINT,
+    BYTE5 SMALLINT,
+    BYTE6 SMALLINT,
+    BYTE11 SMALLINT,
+    BYTE12 SMALLINT,
+    BYTE13 SMALLINT,
+    BYTE16 SMALLINT,
+    BYTE17 SMALLINT,
+    BYTE18 SMALLINT,
+    BYTE20 SMALLINT,
+    BYTE21 SMALLINT,
+    BYTE22 SMALLINT,
+    BYTE30 SMALLINT,
+    BYTE31 SMALLINT,
+    BYTE32 SMALLINT,
+    BYTE36 SMALLINT,
+    BYTE37 SMALLINT,
+    BYTE38 SMALLINT,
+    BYTE40 SMALLINT,
+    BYTE41 SMALLINT,
+    BYTE42 SMALLINT,
+    BYTE43 SMALLINT,
+    BYTE47 SMALLINT,
+    BYTE48 SMALLINT,
+    BYTE49 SMALLINT,
+    BYTE52 SMALLINT,
+    BYTE53 SMALLINT,
+    BYTE54 SMALLINT,
+    BYTE56 SMALLINT,
+    BYTE57 SMALLINT,
+    BYTE58 SMALLINT,
+    BYTE66 SMALLINT,
+    BYTE67 SMALLINT,
+    BYTE68 SMALLINT,
+    BYTE72 SMALLINT,
+    BYTE73 SMALLINT,
+    BYTE74 SMALLINT,
+    BYTE76 SMALLINT,
+    BYTE77 SMALLINT,
+    BYTE78 SMALLINT,
+    BYTE83 SMALLINT,
+    BYTE84 SMALLINT,
+    BYTE85 SMALLINT,
+    BYTE88 SMALLINT,
+    BYTE89 SMALLINT,
+    BYTE90 SMALLINT,
+    BYTE92 SMALLINT,
+    BYTE93 SMALLINT,
+    BYTE94 SMALLINT,
+    BYTE102 SMALLINT,
+    BYTE103 SMALLINT,
+    BYTE104 SMALLINT,
+    BYTE108 SMALLINT,
+    BYTE109 SMALLINT,
+    BYTE110 SMALLINT,
+    BYTE112 SMALLINT,
+    BYTE113 SMALLINT,
+    BYTE114 SMALLINT,
+    BYTE119 SMALLINT,
+    BYTE120 SMALLINT,
+    BYTE121 SMALLINT,
+    BYTE124 SMALLINT,
+    BYTE125 SMALLINT,
+    BYTE126 SMALLINT,
+    BYTE128 SMALLINT,
+    BYTE129 SMALLINT,
+    BYTE130 SMALLINT,
+    BYTE138 SMALLINT,
+    BYTE139 SMALLINT,
+    BYTE140 SMALLINT,
+    CONSTRAINT AllTypes_PK PRIMARY KEY (IDENTIFIER)
+);
+
 -------------------------
 --inheritance
 -------------------------
 
+DROP TABLE AllPersist;
+DROP TABLE TopNonPersistB;
+DROP TABLE TopPersist;
+DROP TABLE FieldSameName;
+
 CREATE TABLE AllPersist (
     KEY_VALUE INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,
     DOUBLE_B DOUBLE,
@@ -209,6 +309,9 @@
 -------------------------
 --instancecallbacks
 -------------------------
+
+DROP TABLE ICNonPersistFds;
+DROP TABLE InstanceCallbacks;
 
 CREATE TABLE ICNonPersistFds (
     ICKEY INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY,


Reply via email to