Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 289023
Collapse All | Expand All

(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/framework/LoadBuildSystem.java (-4 / +6 lines)
Lines 93-102 Link Here
93
        session.executeNonSelectingCall(new SQLCall("Create table LOADBUILD (id number(10), lbtimestamp date, lberrors number(10), fatalErrors number(10), loginChoice varchar2(100), os varchar2(100), toplink_version varchar(100), jvm varchar2(100), machine varchar2(100), numberOfTests number(10), lbuserName varchar2(50), primary key (id))"));
93
        session.executeNonSelectingCall(new SQLCall("Create table LOADBUILD (id number(10), lbtimestamp date, lberrors number(10), fatalErrors number(10), loginChoice varchar2(100), os varchar2(100), toplink_version varchar(100), jvm varchar2(100), machine varchar2(100), numberOfTests number(10), lbuserName varchar2(50), primary key (id))"));
94
        session.executeNonSelectingCall(new SQLCall("Create table RESULT (id number(10), description varchar2(2000), exception varchar2(2000), name varchar2(1000), outcome varchar2(100), test_time number(10), total_time number(10), summaryId number(10), lbuildId number(10), primary key (id))"));
94
        session.executeNonSelectingCall(new SQLCall("Create table RESULT (id number(10), description varchar2(2000), exception varchar2(2000), name varchar2(1000), outcome varchar2(100), test_time number(10), total_time number(10), summaryId number(10), lbuildId number(10), primary key (id))"));
95
        session.executeNonSelectingCall(new SQLCall("Create table SUMMARY (id number(10), description varchar2(2000), setup_failures number(10), errors number(10), fatalErrors number(10), name varchar2(1000), passed number(10), problems number(10), setupException varchar2(2000), total_time number(10), totalTests number(10), warnings number(10), lbuildId number(10), parentId number(10), primary key (id))"));
95
        session.executeNonSelectingCall(new SQLCall("Create table SUMMARY (id number(10), description varchar2(2000), setup_failures number(10), errors number(10), fatalErrors number(10), name varchar2(1000), passed number(10), problems number(10), setupException varchar2(2000), total_time number(10), totalTests number(10), warnings number(10), lbuildId number(10), parentId number(10), primary key (id))"));
96
        session.executeNonSelectingCall(new SQLCall("ALTER TABLE RESULT ADD CONSTRAINT FK_RESULT_summaryId FOREIGN KEY (summaryId) REFERENCES SUMMARY (id)"));
96
        if (session.getPlatform().supportsUniqueKeyConstraints()){
97
        session.executeNonSelectingCall(new SQLCall("ALTER TABLE RESULT ADD CONSTRAINT FK_RESULT_lbuildId FOREIGN KEY (lbuildId) REFERENCES LOADBUILD (id)"));
97
            session.executeNonSelectingCall(new SQLCall("ALTER TABLE RESULT ADD CONSTRAINT FK_RESULT_summaryId FOREIGN KEY (summaryId) REFERENCES SUMMARY (id)"));
98
        session.executeNonSelectingCall(new SQLCall("ALTER TABLE SUMMARY ADD CONSTRAINT FK_LOADBUILD_lbuildId FOREIGN KEY (lbuildId) REFERENCES LOADBUILD (id)"));
98
            session.executeNonSelectingCall(new SQLCall("ALTER TABLE RESULT ADD CONSTRAINT FK_RESULT_lbuildId FOREIGN KEY (lbuildId) REFERENCES LOADBUILD (id)"));
99
        session.executeNonSelectingCall(new SQLCall("ALTER TABLE SUMMARY ADD CONSTRAINT FK_LOADBUILD_parentId FOREIGN KEY (parentId) REFERENCES SUMMARY (id)"));
99
            session.executeNonSelectingCall(new SQLCall("ALTER TABLE SUMMARY ADD CONSTRAINT FK_LOADBUILD_lbuildId FOREIGN KEY (lbuildId) REFERENCES LOADBUILD (id)"));
100
            session.executeNonSelectingCall(new SQLCall("ALTER TABLE SUMMARY ADD CONSTRAINT FK_LOADBUILD_parentId FOREIGN KEY (parentId) REFERENCES SUMMARY (id)"));
101
        }
100
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_lbtimestamp ON LOADBUILD (lbtimestamp)"));
102
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_lbtimestamp ON LOADBUILD (lbtimestamp)"));
101
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_loginChoice ON LOADBUILD (loginChoice)"));
103
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_loginChoice ON LOADBUILD (loginChoice)"));
102
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_toplink_version ON LOADBUILD (toplink_version)"));
104
        session.executeNonSelectingCall(new SQLCall("Create INDEX IX_LOADBUILD_toplink_version ON LOADBUILD (toplink_version)"));
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/employee/relational/EmployeeTableCreator.java (-1 / +1 lines)
Lines 367-373 Link Here
367
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
367
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
368
        field1.setName("BUDGET");
368
        field1.setName("BUDGET");
369
        field1.setTypeName("DOUBLE PRECIS");
369
        field1.setTypeName("DOUBLE PRECIS");
370
        field1.setSize(32);
370
        field1.setSize(18);
371
        field1.setShouldAllowNull(true);
371
        field1.setShouldAllowNull(true);
372
        field1.setIsPrimaryKey(false);
372
        field1.setIsPrimaryKey(false);
373
        field1.setUnique(false);
373
        field1.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/inheritance/InheritanceSystem.java (-6 / +8 lines)
Lines 118-129 Link Here
118
         
118
         
119
            // Drop old constraints.
119
            // Drop old constraints.
120
            try {
120
            try {
121
                session.executeNonSelectingSQL("Alter TABLE PROJECT_WORKER_BATCH DROP CONSTRAINT PROJECT_WORKER_BATCH_HD");
121
                if (session.getPlatform().supportsUniqueKeyConstraints()){
122
                session.executeNonSelectingSQL("Alter TABLE PROJECT_BATCH DROP CONSTRAINT PROJECT_WORKER_BATCH_FK");
122
                    session.executeNonSelectingSQL("Alter TABLE PROJECT_WORKER_BATCH DROP CONSTRAINT PROJECT_WORKER_BATCH_HD");
123
                session.executeNonSelectingSQL("Alter TABLE ALLIGATOR DROP CONSTRAINT FK_ALLIGATOR_VICTIM_ID");
123
                    session.executeNonSelectingSQL("Alter TABLE PROJECT_BATCH DROP CONSTRAINT PROJECT_WORKER_BATCH_FK");
124
                session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_FRND");
124
                    session.executeNonSelectingSQL("Alter TABLE ALLIGATOR DROP CONSTRAINT FK_ALLIGATOR_VICTIM_ID");
125
                session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_REP");
125
                    session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_FRND");
126
                session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_BS");
126
                    session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_REP");
127
                    session.executeNonSelectingSQL("Alter TABLE PERSON2 DROP CONSTRAINT PERSON2_PERSON2_BS");
128
                }
127
            } catch (Exception ignore) {}
129
            } catch (Exception ignore) {}
128
        }
130
        }
129
    }
131
    }
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/inheritance/InheritanceTableCreator.java (-11 / +11 lines)
Lines 60-66 Link Here
60
        FieldDefinition fieldID = new FieldDefinition();
60
        FieldDefinition fieldID = new FieldDefinition();
61
        fieldID.setName("ID");
61
        fieldID.setName("ID");
62
        fieldID.setTypeName("NUMBER");
62
        fieldID.setTypeName("NUMBER");
63
        fieldID.setSize(19);
63
        fieldID.setSize(18);
64
        fieldID.setSubSize(0);
64
        fieldID.setSubSize(0);
65
        fieldID.setIsPrimaryKey(true);
65
        fieldID.setIsPrimaryKey(true);
66
        fieldID.setIsIdentity(false);
66
        fieldID.setIsIdentity(false);
Lines 82-88 Link Here
82
        FieldDefinition fieldVICTIM_ID = new FieldDefinition();
82
        FieldDefinition fieldVICTIM_ID = new FieldDefinition();
83
        fieldVICTIM_ID.setName("VICTIM_ID");
83
        fieldVICTIM_ID.setName("VICTIM_ID");
84
        fieldVICTIM_ID.setTypeName("NUMBER");
84
        fieldVICTIM_ID.setTypeName("NUMBER");
85
        fieldVICTIM_ID.setSize(19);
85
        fieldVICTIM_ID.setSize(18);
86
        fieldVICTIM_ID.setSubSize(0);
86
        fieldVICTIM_ID.setSubSize(0);
87
        fieldVICTIM_ID.setIsPrimaryKey(false);
87
        fieldVICTIM_ID.setIsPrimaryKey(false);
88
        fieldVICTIM_ID.setIsIdentity(false);
88
        fieldVICTIM_ID.setIsIdentity(false);
Lines 107-113 Link Here
107
        FieldDefinition fieldID = new FieldDefinition();
107
        FieldDefinition fieldID = new FieldDefinition();
108
        fieldID.setName("ID");
108
        fieldID.setName("ID");
109
        fieldID.setTypeName("NUMBER");
109
        fieldID.setTypeName("NUMBER");
110
        fieldID.setSize(19);
110
        fieldID.setSize(18);
111
        fieldID.setSubSize(0);
111
        fieldID.setSubSize(0);
112
        fieldID.setIsPrimaryKey(true);
112
        fieldID.setIsPrimaryKey(true);
113
        fieldID.setIsIdentity(false);
113
        fieldID.setIsIdentity(false);
Lines 147-153 Link Here
147
        FieldDefinition fieldID = new FieldDefinition();
147
        FieldDefinition fieldID = new FieldDefinition();
148
        fieldID.setName("ID");
148
        fieldID.setName("ID");
149
        fieldID.setTypeName("NUMBER");
149
        fieldID.setTypeName("NUMBER");
150
        fieldID.setSize(19);
150
        fieldID.setSize(18);
151
        fieldID.setSubSize(0);
151
        fieldID.setSubSize(0);
152
        fieldID.setIsPrimaryKey(true);
152
        fieldID.setIsPrimaryKey(true);
153
        fieldID.setIsIdentity(false);
153
        fieldID.setIsIdentity(false);
Lines 502-508 Link Here
502
        FieldDefinition fieldGH_ID = new FieldDefinition();
502
        FieldDefinition fieldGH_ID = new FieldDefinition();
503
        fieldGH_ID.setName("GH_ID");
503
        fieldGH_ID.setName("GH_ID");
504
        fieldGH_ID.setTypeName("NUMBER");
504
        fieldGH_ID.setTypeName("NUMBER");
505
        fieldGH_ID.setSize(19);
505
        fieldGH_ID.setSize(18);
506
        fieldGH_ID.setSubSize(0);
506
        fieldGH_ID.setSubSize(0);
507
        fieldGH_ID.setIsPrimaryKey(true);
507
        fieldGH_ID.setIsPrimaryKey(true);
508
        fieldGH_ID.setIsIdentity(false);
508
        fieldGH_ID.setIsIdentity(false);
Lines 513-519 Link Here
513
        FieldDefinition fieldGH_MAXIMUMJUMP = new FieldDefinition();
513
        FieldDefinition fieldGH_MAXIMUMJUMP = new FieldDefinition();
514
        fieldGH_MAXIMUMJUMP.setName("GH_MAXIMUMJUMP");
514
        fieldGH_MAXIMUMJUMP.setName("GH_MAXIMUMJUMP");
515
        fieldGH_MAXIMUMJUMP.setTypeName("NUMBER");
515
        fieldGH_MAXIMUMJUMP.setTypeName("NUMBER");
516
        fieldGH_MAXIMUMJUMP.setSize(19);
516
        fieldGH_MAXIMUMJUMP.setSize(18);
517
        fieldGH_MAXIMUMJUMP.setSubSize(0);
517
        fieldGH_MAXIMUMJUMP.setSubSize(0);
518
        fieldGH_MAXIMUMJUMP.setIsPrimaryKey(false);
518
        fieldGH_MAXIMUMJUMP.setIsPrimaryKey(false);
519
        fieldGH_MAXIMUMJUMP.setIsIdentity(false);
519
        fieldGH_MAXIMUMJUMP.setIsIdentity(false);
Lines 705-711 Link Here
705
        FieldDefinition fieldIN_ID = new FieldDefinition();
705
        FieldDefinition fieldIN_ID = new FieldDefinition();
706
        fieldIN_ID.setName("IN_ID");
706
        fieldIN_ID.setName("IN_ID");
707
        fieldIN_ID.setTypeName("NUMBER");
707
        fieldIN_ID.setTypeName("NUMBER");
708
        fieldIN_ID.setSize(19);
708
        fieldIN_ID.setSize(18);
709
        fieldIN_ID.setSubSize(0);
709
        fieldIN_ID.setSubSize(0);
710
        fieldIN_ID.setIsPrimaryKey(true);
710
        fieldIN_ID.setIsPrimaryKey(true);
711
        fieldIN_ID.setIsIdentity(false);
711
        fieldIN_ID.setIsIdentity(false);
Lines 727-733 Link Here
727
        FieldDefinition fieldIN_NUMBEROFLEGS = new FieldDefinition();
727
        FieldDefinition fieldIN_NUMBEROFLEGS = new FieldDefinition();
728
        fieldIN_NUMBEROFLEGS.setName("IN_NUMBEROFLEGS");
728
        fieldIN_NUMBEROFLEGS.setName("IN_NUMBEROFLEGS");
729
        fieldIN_NUMBEROFLEGS.setTypeName("NUMBER");
729
        fieldIN_NUMBEROFLEGS.setTypeName("NUMBER");
730
        fieldIN_NUMBEROFLEGS.setSize(19);
730
        fieldIN_NUMBEROFLEGS.setSize(18);
731
        fieldIN_NUMBEROFLEGS.setSubSize(0);
731
        fieldIN_NUMBEROFLEGS.setSubSize(0);
732
        fieldIN_NUMBEROFLEGS.setIsPrimaryKey(false);
732
        fieldIN_NUMBEROFLEGS.setIsPrimaryKey(false);
733
        fieldIN_NUMBEROFLEGS.setIsIdentity(false);
733
        fieldIN_NUMBEROFLEGS.setIsIdentity(false);
Lines 738-744 Link Here
738
        FieldDefinition fieldENTOMOLOGIST = new FieldDefinition();
738
        FieldDefinition fieldENTOMOLOGIST = new FieldDefinition();
739
        fieldENTOMOLOGIST.setName("ENTOMOLOGIST");
739
        fieldENTOMOLOGIST.setName("ENTOMOLOGIST");
740
        fieldENTOMOLOGIST.setTypeName("NUMBER");
740
        fieldENTOMOLOGIST.setTypeName("NUMBER");
741
        fieldENTOMOLOGIST.setSize(19);
741
        fieldENTOMOLOGIST.setSize(18);
742
        fieldENTOMOLOGIST.setSubSize(0);
742
        fieldENTOMOLOGIST.setSubSize(0);
743
        fieldENTOMOLOGIST.setIsPrimaryKey(false);
743
        fieldENTOMOLOGIST.setIsPrimaryKey(false);
744
        fieldENTOMOLOGIST.setIsIdentity(false);
744
        fieldENTOMOLOGIST.setIsIdentity(false);
Lines 889-895 Link Here
889
        FieldDefinition fieldLB_ID = new FieldDefinition();
889
        FieldDefinition fieldLB_ID = new FieldDefinition();
890
        fieldLB_ID.setName("LB_ID");
890
        fieldLB_ID.setName("LB_ID");
891
        fieldLB_ID.setTypeName("NUMBER");
891
        fieldLB_ID.setTypeName("NUMBER");
892
        fieldLB_ID.setSize(19);
892
        fieldLB_ID.setSize(18);
893
        fieldLB_ID.setSubSize(0);
893
        fieldLB_ID.setSubSize(0);
894
        fieldLB_ID.setIsPrimaryKey(true);
894
        fieldLB_ID.setIsPrimaryKey(true);
895
        fieldLB_ID.setIsIdentity(false);
895
        fieldLB_ID.setIsIdentity(false);
Lines 900-906 Link Here
900
        FieldDefinition fieldLB_NUMBEROFSPOTS = new FieldDefinition();
900
        FieldDefinition fieldLB_NUMBEROFSPOTS = new FieldDefinition();
901
        fieldLB_NUMBEROFSPOTS.setName("LB_NUMBEROFSPOTS");
901
        fieldLB_NUMBEROFSPOTS.setName("LB_NUMBEROFSPOTS");
902
        fieldLB_NUMBEROFSPOTS.setTypeName("NUMBER");
902
        fieldLB_NUMBEROFSPOTS.setTypeName("NUMBER");
903
        fieldLB_NUMBEROFSPOTS.setSize(19);
903
        fieldLB_NUMBEROFSPOTS.setSize(18);
904
        fieldLB_NUMBEROFSPOTS.setSubSize(0);
904
        fieldLB_NUMBEROFSPOTS.setSubSize(0);
905
        fieldLB_NUMBEROFSPOTS.setIsPrimaryKey(false);
905
        fieldLB_NUMBEROFSPOTS.setIsPrimaryKey(false);
906
        fieldLB_NUMBEROFSPOTS.setIsIdentity(false);
906
        fieldLB_NUMBEROFSPOTS.setIsIdentity(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/inheritance/STI_EmployeeTableCreator.java (-1 / +1 lines)
Lines 200-206 Link Here
200
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field6 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
200
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field6 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
201
        field6.setName("BUDGET");
201
        field6.setName("BUDGET");
202
        field6.setTypeName("DOUBLE PRECIS");
202
        field6.setTypeName("DOUBLE PRECIS");
203
        field6.setSize(32);
203
        field6.setSize(18);
204
        field6.setShouldAllowNull(true);
204
        field6.setShouldAllowNull(true);
205
        field6.setIsPrimaryKey(false);
205
        field6.setIsPrimaryKey(false);
206
        field6.setUnique(false);
206
        field6.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/insurance/InsuranceTableCreator.java (-14 / +14 lines)
Lines 40-46 Link Here
40
        FieldDefinition fieldHOLDER_ID = new FieldDefinition();
40
        FieldDefinition fieldHOLDER_ID = new FieldDefinition();
41
        fieldHOLDER_ID.setName("HOLDER_ID");
41
        fieldHOLDER_ID.setName("HOLDER_ID");
42
        fieldHOLDER_ID.setTypeName("NUMBER");
42
        fieldHOLDER_ID.setTypeName("NUMBER");
43
        fieldHOLDER_ID.setSize(19);
43
        fieldHOLDER_ID.setSize(18);
44
        fieldHOLDER_ID.setSubSize(0);
44
        fieldHOLDER_ID.setSubSize(0);
45
        fieldHOLDER_ID.setIsPrimaryKey(true);
45
        fieldHOLDER_ID.setIsPrimaryKey(true);
46
        fieldHOLDER_ID.setIsIdentity(false);
46
        fieldHOLDER_ID.setIsIdentity(false);
Lines 76-82 Link Here
76
        FieldDefinition fieldCLM_ID = new FieldDefinition();
76
        FieldDefinition fieldCLM_ID = new FieldDefinition();
77
        fieldCLM_ID.setName("CLM_ID");
77
        fieldCLM_ID.setName("CLM_ID");
78
        fieldCLM_ID.setTypeName("NUMBER");
78
        fieldCLM_ID.setTypeName("NUMBER");
79
        fieldCLM_ID.setSize(19);
79
        fieldCLM_ID.setSize(18);
80
        fieldCLM_ID.setSubSize(0);
80
        fieldCLM_ID.setSubSize(0);
81
        fieldCLM_ID.setIsPrimaryKey(true);
81
        fieldCLM_ID.setIsPrimaryKey(true);
82
        fieldCLM_ID.setIsIdentity(false);
82
        fieldCLM_ID.setIsIdentity(false);
Lines 87-93 Link Here
87
        FieldDefinition fieldPOL_ID = new FieldDefinition();
87
        FieldDefinition fieldPOL_ID = new FieldDefinition();
88
        fieldPOL_ID.setName("POL_ID");
88
        fieldPOL_ID.setName("POL_ID");
89
        fieldPOL_ID.setTypeName("NUMBER");
89
        fieldPOL_ID.setTypeName("NUMBER");
90
        fieldPOL_ID.setSize(19);
90
        fieldPOL_ID.setSize(18);
91
        fieldPOL_ID.setSubSize(0);
91
        fieldPOL_ID.setSubSize(0);
92
        fieldPOL_ID.setIsPrimaryKey(false);
92
        fieldPOL_ID.setIsPrimaryKey(false);
93
        fieldPOL_ID.setIsIdentity(false);
93
        fieldPOL_ID.setIsIdentity(false);
Lines 109-115 Link Here
109
        FieldDefinition fieldAMOUNT = new FieldDefinition();
109
        FieldDefinition fieldAMOUNT = new FieldDefinition();
110
        fieldAMOUNT.setName("AMOUNT");
110
        fieldAMOUNT.setName("AMOUNT");
111
        fieldAMOUNT.setTypeName("FLOAT");
111
        fieldAMOUNT.setTypeName("FLOAT");
112
        fieldAMOUNT.setSize(19);
112
        fieldAMOUNT.setSize(18);
113
        fieldAMOUNT.setSubSize(4);
113
        fieldAMOUNT.setSubSize(4);
114
        fieldAMOUNT.setIsPrimaryKey(false);
114
        fieldAMOUNT.setIsPrimaryKey(false);
115
        fieldAMOUNT.setIsIdentity(false);
115
        fieldAMOUNT.setIsIdentity(false);
Lines 131-137 Link Here
131
        FieldDefinition fieldAREA = new FieldDefinition();
131
        FieldDefinition fieldAREA = new FieldDefinition();
132
        fieldAREA.setName("AREA");
132
        fieldAREA.setName("AREA");
133
        fieldAREA.setTypeName("NUMBER");
133
        fieldAREA.setTypeName("NUMBER");
134
        fieldAREA.setSize(19);
134
        fieldAREA.setSize(18);
135
        fieldAREA.setSubSize(4);
135
        fieldAREA.setSubSize(4);
136
        fieldAREA.setIsPrimaryKey(false);
136
        fieldAREA.setIsPrimaryKey(false);
137
        fieldAREA.setIsIdentity(false);
137
        fieldAREA.setIsIdentity(false);
Lines 156-162 Link Here
156
        FieldDefinition fieldSSN = new FieldDefinition();
156
        FieldDefinition fieldSSN = new FieldDefinition();
157
        fieldSSN.setName("SSN");
157
        fieldSSN.setName("SSN");
158
        fieldSSN.setTypeName("NUMBER");
158
        fieldSSN.setTypeName("NUMBER");
159
        fieldSSN.setSize(19);
159
        fieldSSN.setSize(18);
160
        fieldSSN.setSubSize(0);
160
        fieldSSN.setSubSize(0);
161
        fieldSSN.setIsPrimaryKey(true);
161
        fieldSSN.setIsPrimaryKey(true);
162
        fieldSSN.setIsIdentity(false);
162
        fieldSSN.setIsIdentity(false);
Lines 229-235 Link Here
229
        FieldDefinition fieldSSN = new FieldDefinition();
229
        FieldDefinition fieldSSN = new FieldDefinition();
230
        fieldSSN.setName("SSN");
230
        fieldSSN.setName("SSN");
231
        fieldSSN.setTypeName("NUMBER");
231
        fieldSSN.setTypeName("NUMBER");
232
        fieldSSN.setSize(19);
232
        fieldSSN.setSize(18);
233
        fieldSSN.setSubSize(0);
233
        fieldSSN.setSubSize(0);
234
        fieldSSN.setIsPrimaryKey(true);
234
        fieldSSN.setIsPrimaryKey(true);
235
        fieldSSN.setIsIdentity(false);
235
        fieldSSN.setIsIdentity(false);
Lines 309-315 Link Here
309
        FieldDefinition fieldHOLDER_SSN = new FieldDefinition();
309
        FieldDefinition fieldHOLDER_SSN = new FieldDefinition();
310
        fieldHOLDER_SSN.setName("HOLDER_SSN");
310
        fieldHOLDER_SSN.setName("HOLDER_SSN");
311
        fieldHOLDER_SSN.setTypeName("NUMBER");
311
        fieldHOLDER_SSN.setTypeName("NUMBER");
312
        fieldHOLDER_SSN.setSize(19);
312
        fieldHOLDER_SSN.setSize(18);
313
        fieldHOLDER_SSN.setSubSize(0);
313
        fieldHOLDER_SSN.setSubSize(0);
314
        fieldHOLDER_SSN.setIsPrimaryKey(true);
314
        fieldHOLDER_SSN.setIsPrimaryKey(true);
315
        fieldHOLDER_SSN.setIsIdentity(false);
315
        fieldHOLDER_SSN.setIsIdentity(false);
Lines 367-373 Link Here
367
        FieldDefinition fieldPOL_ID = new FieldDefinition();
367
        FieldDefinition fieldPOL_ID = new FieldDefinition();
368
        fieldPOL_ID.setName("POL_ID");
368
        fieldPOL_ID.setName("POL_ID");
369
        fieldPOL_ID.setTypeName("NUMBER");
369
        fieldPOL_ID.setTypeName("NUMBER");
370
        fieldPOL_ID.setSize(19);
370
        fieldPOL_ID.setSize(18);
371
        fieldPOL_ID.setSubSize(0);
371
        fieldPOL_ID.setSubSize(0);
372
        fieldPOL_ID.setIsPrimaryKey(true);
372
        fieldPOL_ID.setIsPrimaryKey(true);
373
        fieldPOL_ID.setIsIdentity(false);
373
        fieldPOL_ID.setIsIdentity(false);
Lines 378-384 Link Here
378
        FieldDefinition fieldSSN = new FieldDefinition();
378
        FieldDefinition fieldSSN = new FieldDefinition();
379
        fieldSSN.setName("SSN");
379
        fieldSSN.setName("SSN");
380
        fieldSSN.setTypeName("NUMBER");
380
        fieldSSN.setTypeName("NUMBER");
381
        fieldSSN.setSize(19);
381
        fieldSSN.setSize(18);
382
        fieldSSN.setSubSize(0);
382
        fieldSSN.setSubSize(0);
383
        fieldSSN.setIsPrimaryKey(false);
383
        fieldSSN.setIsPrimaryKey(false);
384
        fieldSSN.setIsIdentity(false);
384
        fieldSSN.setIsIdentity(false);
Lines 411-417 Link Here
411
        FieldDefinition fieldMAX_COV = new FieldDefinition();
411
        FieldDefinition fieldMAX_COV = new FieldDefinition();
412
        fieldMAX_COV.setName("MAX_COV");
412
        fieldMAX_COV.setName("MAX_COV");
413
        fieldMAX_COV.setTypeName("NUMBER");
413
        fieldMAX_COV.setTypeName("NUMBER");
414
        fieldMAX_COV.setSize(19);
414
        fieldMAX_COV.setSize(18);
415
        fieldMAX_COV.setSubSize(4);
415
        fieldMAX_COV.setSubSize(4);
416
        fieldMAX_COV.setIsPrimaryKey(false);
416
        fieldMAX_COV.setIsPrimaryKey(false);
417
        fieldMAX_COV.setIsIdentity(false);
417
        fieldMAX_COV.setIsIdentity(false);
Lines 424-430 Link Here
424
        //NUMBER corresponds to long which is mapped to INTEGER data type in some database such as DB2 and MySQL.  
424
        //NUMBER corresponds to long which is mapped to INTEGER data type in some database such as DB2 and MySQL.  
425
        //FLOAT should be used which reflect float java type.
425
        //FLOAT should be used which reflect float java type.
426
        fieldCOV_RATE.setTypeName("FLOAT(16)");
426
        fieldCOV_RATE.setTypeName("FLOAT(16)");
427
        fieldCOV_RATE.setSize(19);
427
        fieldCOV_RATE.setSize(18);
428
        fieldCOV_RATE.setSubSize(4);
428
        fieldCOV_RATE.setSubSize(4);
429
        fieldCOV_RATE.setIsPrimaryKey(false);
429
        fieldCOV_RATE.setIsPrimaryKey(false);
430
        fieldCOV_RATE.setIsIdentity(false);
430
        fieldCOV_RATE.setIsIdentity(false);
Lines 460-466 Link Here
460
        FieldDefinition fieldCLM_ID = new FieldDefinition();
460
        FieldDefinition fieldCLM_ID = new FieldDefinition();
461
        fieldCLM_ID.setName("CLM_ID");
461
        fieldCLM_ID.setName("CLM_ID");
462
        fieldCLM_ID.setTypeName("NUMBER");
462
        fieldCLM_ID.setTypeName("NUMBER");
463
        fieldCLM_ID.setSize(19);
463
        fieldCLM_ID.setSize(18);
464
        fieldCLM_ID.setSubSize(0);
464
        fieldCLM_ID.setSubSize(0);
465
        fieldCLM_ID.setIsPrimaryKey(true);
465
        fieldCLM_ID.setIsPrimaryKey(true);
466
        fieldCLM_ID.setIsIdentity(false);
466
        fieldCLM_ID.setIsIdentity(false);
Lines 507-513 Link Here
507
        FieldDefinition fieldPOL_ID = new FieldDefinition();
507
        FieldDefinition fieldPOL_ID = new FieldDefinition();
508
        fieldPOL_ID.setName("POL_ID");
508
        fieldPOL_ID.setName("POL_ID");
509
        fieldPOL_ID.setTypeName("NUMBER");
509
        fieldPOL_ID.setTypeName("NUMBER");
510
        fieldPOL_ID.setSize(19);
510
        fieldPOL_ID.setSize(18);
511
        fieldPOL_ID.setSubSize(0);
511
        fieldPOL_ID.setSubSize(0);
512
        fieldPOL_ID.setIsPrimaryKey(true);
512
        fieldPOL_ID.setIsPrimaryKey(true);
513
        fieldPOL_ID.setIsIdentity(false);
513
        fieldPOL_ID.setIsIdentity(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/interfaces/InterfaceWithoutTablesSystem.java (-2 / +6 lines)
Lines 53-60 Link Here
53
         * There is no possibility of existing instances being messed up, because all the tables are dropped
53
         * There is no possibility of existing instances being messed up, because all the tables are dropped
54
         * here as well
54
         * here as well
55
         */
55
         */
56
        session.executeNonSelectingCall(new org.eclipse.persistence.queries.SQLCall("DELETE FROM SEQUENCE WHERE SEQ_NAME = 'EMAIL_SEQ'"));
56
        String sequenceTableName = "SEQUENCE";
57
        session.executeNonSelectingCall(new org.eclipse.persistence.queries.SQLCall("DELETE FROM SEQUENCE WHERE SEQ_NAME = 'PHONE_SEQ'"));
57
        if (session.getPlatform().getDefaultSequence().isTable()) {
58
            sequenceTableName = session.getPlatform().getQualifiedSequenceTableName();
59
        }
60
        session.executeNonSelectingCall(new org.eclipse.persistence.queries.SQLCall("DELETE FROM " + sequenceTableName + " WHERE SEQ_NAME = 'EMAIL_SEQ'"));
61
        session.executeNonSelectingCall(new org.eclipse.persistence.queries.SQLCall("DELETE FROM " + sequenceTableName  + " WHERE SEQ_NAME = 'PHONE_SEQ'"));
58
        schemaManager.createSequences();
62
        schemaManager.createSequences();
59
    }
63
    }
60
64
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/onetoonejointable/EmployeeTableCreator.java (-1 / +1 lines)
Lines 406-412 Link Here
406
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
406
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
407
        field1.setName("BUDGET");
407
        field1.setName("BUDGET");
408
        field1.setTypeName("DOUBLE PRECIS");
408
        field1.setTypeName("DOUBLE PRECIS");
409
        field1.setSize(32);
409
        field1.setSize(18);
410
        field1.setShouldAllowNull(true);
410
        field1.setShouldAllowNull(true);
411
        field1.setIsPrimaryKey(false);
411
        field1.setIsPrimaryKey(false);
412
        field1.setUnique(false);
412
        field1.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/orderedlist/EmployeeTableCreator.java (-1 / +1 lines)
Lines 299-305 Link Here
299
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
299
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
300
        field1.setName("BUDGET");
300
        field1.setName("BUDGET");
301
        field1.setTypeName("DOUBLE PRECIS");
301
        field1.setTypeName("DOUBLE PRECIS");
302
        field1.setSize(32);
302
        field1.setSize(18);
303
        field1.setShouldAllowNull(true);
303
        field1.setShouldAllowNull(true);
304
        field1.setIsPrimaryKey(false);
304
        field1.setIsPrimaryKey(false);
305
        field1.setUnique(false);
305
        field1.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/models/performance/EmployeeTableCreator.java (-1 / +1 lines)
Lines 276-282 Link Here
276
        FieldDefinition field1 = new FieldDefinition();
276
        FieldDefinition field1 = new FieldDefinition();
277
        field1.setName("BUDGET");
277
        field1.setName("BUDGET");
278
        field1.setTypeName("DOUBLE PRECIS");
278
        field1.setTypeName("DOUBLE PRECIS");
279
        field1.setSize(32);
279
        field1.setSize(18);
280
        field1.setShouldAllowNull(true);
280
        field1.setShouldAllowNull(true);
281
        field1.setIsPrimaryKey(false);
281
        field1.setIsPrimaryKey(false);
282
        field1.setUnique(false);
282
        field1.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/nls/japanese/NLSEmployeeTableCreator.java (-1 / +1 lines)
Lines 327-333 Link Here
327
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
327
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
328
        field1.setName("\u3044\u306a\u3048\u304d\u304a\u3068");//("BUDGET");
328
        field1.setName("\u3044\u306a\u3048\u304d\u304a\u3068");//("BUDGET");
329
        field1.setTypeName("DOUBLE PRECIS");
329
        field1.setTypeName("DOUBLE PRECIS");
330
        field1.setSize(32);
330
        field1.setSize(18);
331
        field1.setShouldAllowNull(true);
331
        field1.setShouldAllowNull(true);
332
        field1.setIsPrimaryKey(false);
332
        field1.setIsPrimaryKey(false);
333
        field1.setUnique(false);
333
        field1.setUnique(false);
(-)foundation/eclipselink.core.test/src/org/eclipse/persistence/testing/tests/tableswithspacesmodel/EmployeeWithSpacesTableCreator.java (-1 / +1 lines)
Lines 309-315 Link Here
309
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
309
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
310
        field1.setName("BUDGET");
310
        field1.setName("BUDGET");
311
        field1.setTypeName("DOUBLE PRECIS");
311
        field1.setTypeName("DOUBLE PRECIS");
312
        field1.setSize(32);
312
        field1.setSize(18);
313
        field1.setShouldAllowNull(true);
313
        field1.setShouldAllowNull(true);
314
        field1.setIsPrimaryKey(false);
314
        field1.setIsPrimaryKey(false);
315
        field1.setUnique(false);
315
        field1.setUnique(false);
(-)foundation/org.eclipse.persistence.core/src/org/eclipse/persistence/tools/schemaframework/TableDefinition.java (-19 / +22 lines)
Lines 626-654 Link Here
626
        if (schemaWriter == null) {
626
        if (schemaWriter == null) {
627
            this.dropConstraintsOnDatabase(session);
627
            this.dropConstraintsOnDatabase(session);
628
        } else {
628
        } else {
629
            for (ForeignKeyConstraint foreignKey : getForeignKeyMap().values()) {
629
            if (session.getPlatform().supportsForeignKeyConstraints()){
630
                buildConstraintDeletionWriter(session, foreignKey, schemaWriter).toString();
630
                for (ForeignKeyConstraint foreignKey : getForeignKeyMap().values()) {
631
                try {
631
                    buildConstraintDeletionWriter(session, foreignKey, schemaWriter).toString();
632
                    if (createSQLFiles) {
632
                    try {
633
                        schemaWriter.write(session.getPlatform().getStoredProcedureTerminationToken());
633
                        if (createSQLFiles) {
634
                            schemaWriter.write(session.getPlatform().getStoredProcedureTerminationToken());
635
                        }
636
                        schemaWriter.write("\n");
637
                    } catch (IOException exception) {
638
                        throw ValidationException.fileError(exception);
634
                    }
639
                    }
635
                    schemaWriter.write("\n");
636
                } catch (IOException exception) {
637
                    throw ValidationException.fileError(exception);
638
                }
640
                }
639
            }
641
            }
640
                     
642
            if (session.getPlatform().supportsUniqueKeyConstraints()){
641
            for (Enumeration uniqueKeysEnum = getUniqueKeys().elements();
643
                for (Enumeration uniqueKeysEnum = getUniqueKeys().elements();
642
                     uniqueKeysEnum.hasMoreElements();) {        
644
                         uniqueKeysEnum.hasMoreElements();) {        
643
                UniqueKeyConstraint uniqueKey = (UniqueKeyConstraint)uniqueKeysEnum.nextElement();
645
                    UniqueKeyConstraint uniqueKey = (UniqueKeyConstraint)uniqueKeysEnum.nextElement();
644
                buildUniqueConstraintDeletionWriter(session, uniqueKey, schemaWriter).toString();
646
                    buildUniqueConstraintDeletionWriter(session, uniqueKey, schemaWriter).toString();
645
                try {
647
                    try {
646
                    if (createSQLFiles) {                    
648
                        if (createSQLFiles) {                    
647
                        schemaWriter.write(session.getPlatform().getStoredProcedureTerminationToken());
649
                            schemaWriter.write(session.getPlatform().getStoredProcedureTerminationToken());
650
                        }
651
                        schemaWriter.write("\n");
652
                    } catch (IOException exception) {
653
                        throw ValidationException.fileError(exception);
648
                    }
654
                    }
649
                    schemaWriter.write("\n");
650
                } catch (IOException exception) {
651
                    throw ValidationException.fileError(exception);
652
                }
655
                }
653
            }
656
            }
654
        }
657
        }
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/advanced/AdvancedTableCreator.java (-3 / +3 lines)
Lines 980-986 Link Here
980
        FieldDefinition field1 = new FieldDefinition();
980
        FieldDefinition field1 = new FieldDefinition();
981
        field1.setName("BUDGET");
981
        field1.setName("BUDGET");
982
        field1.setTypeName("DOUBLE PRECIS");
982
        field1.setTypeName("DOUBLE PRECIS");
983
        field1.setSize(32);
983
        field1.setSize(18);
984
        field1.setShouldAllowNull(true );
984
        field1.setShouldAllowNull(true );
985
        field1.setIsPrimaryKey(false );
985
        field1.setIsPrimaryKey(false );
986
        field1.setUnique(false );
986
        field1.setUnique(false );
Lines 1168-1174 Link Here
1168
        FieldDefinition field1 = new FieldDefinition();
1168
        FieldDefinition field1 = new FieldDefinition();
1169
        field1.setName("PURCHASES");
1169
        field1.setName("PURCHASES");
1170
        field1.setTypeName("DOUBLE PRECIS");
1170
        field1.setTypeName("DOUBLE PRECIS");
1171
        field1.setSize(32);
1171
        field1.setSize(18);
1172
        field1.setShouldAllowNull(true );
1172
        field1.setShouldAllowNull(true );
1173
        field1.setIsPrimaryKey(false );
1173
        field1.setIsPrimaryKey(false );
1174
        field1.setUnique(false );
1174
        field1.setUnique(false );
Lines 1395-1401 Link Here
1395
        FieldDefinition fieldCOST = new FieldDefinition();
1395
        FieldDefinition fieldCOST = new FieldDefinition();
1396
        fieldCOST.setName("COST");
1396
        fieldCOST.setName("COST");
1397
        fieldCOST.setTypeName("DOUBLE PRECIS");
1397
        fieldCOST.setTypeName("DOUBLE PRECIS");
1398
        fieldCOST.setSize(32);
1398
        fieldCOST.setSize(18);
1399
        table.addField(fieldCOST);
1399
        table.addField(fieldCOST);
1400
1400
1401
        FieldDefinition fieldTAGS = new FieldDefinition();
1401
        FieldDefinition fieldTAGS = new FieldDefinition();
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/advanced/compositepk/CompositePKTableCreator.java (-2 / +4 lines)
Lines 747-754 Link Here
747
     */
747
     */
748
    public void replaceTables(DatabaseSession session) {
748
    public void replaceTables(DatabaseSession session) {
749
        try {
749
        try {
750
            session.executeNonSelectingSQL("Alter table CMP3_SCIENTIST drop constraint CMP3_SCIENTIST_CUBICLE");
750
            if (session.getPlatform().supportsUniqueKeyConstraints()){
751
            session.executeNonSelectingSQL("Alter table CMP3_SCIENTIST drop constraint CMP3_SCIENTIST_DEPT");
751
                session.executeNonSelectingSQL("Alter table CMP3_SCIENTIST drop constraint CMP3_SCIENTIST_CUBICLE");
752
                session.executeNonSelectingSQL("Alter table CMP3_SCIENTIST drop constraint CMP3_SCIENTIST_DEPT");
753
            }
752
        } catch (Exception ignore) {}
754
        } catch (Exception ignore) {}
753
        super.replaceTables(session);
755
        super.replaceTables(session);
754
    }
756
    }
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/complexaggregate/ComplexAggregateTableCreator.java (-13 / +13 lines)
Lines 45-51 Link Here
45
        FieldDefinition fieldID = new FieldDefinition();
45
        FieldDefinition fieldID = new FieldDefinition();
46
        fieldID.setName("ID");
46
        fieldID.setName("ID");
47
        fieldID.setTypeName("NUMBER");
47
        fieldID.setTypeName("NUMBER");
48
        fieldID.setSize(19);
48
        fieldID.setSize(18);
49
        fieldID.setSubSize(0);
49
        fieldID.setSubSize(0);
50
        fieldID.setIsPrimaryKey(true);
50
        fieldID.setIsPrimaryKey(true);
51
        fieldID.setIsIdentity(true);
51
        fieldID.setIsIdentity(true);
Lines 100-106 Link Here
100
        FieldDefinition fieldWORLDID = new FieldDefinition();
100
        FieldDefinition fieldWORLDID = new FieldDefinition();
101
        fieldWORLDID.setName("WORLD_ID");
101
        fieldWORLDID.setName("WORLD_ID");
102
        fieldWORLDID.setTypeName("NUMBER");
102
        fieldWORLDID.setTypeName("NUMBER");
103
        fieldWORLDID.setSize(19);
103
        fieldWORLDID.setSize(18);
104
        fieldWORLDID.setSubSize(0);
104
        fieldWORLDID.setSubSize(0);
105
        fieldWORLDID.setIsPrimaryKey(false);
105
        fieldWORLDID.setIsPrimaryKey(false);
106
        fieldWORLDID.setIsIdentity(false);
106
        fieldWORLDID.setIsIdentity(false);
Lines 119-125 Link Here
119
        FieldDefinition fieldID = new FieldDefinition();
119
        FieldDefinition fieldID = new FieldDefinition();
120
        fieldID.setName("ID");
120
        fieldID.setName("ID");
121
        fieldID.setTypeName("NUMBER");
121
        fieldID.setTypeName("NUMBER");
122
        fieldID.setSize(19);
122
        fieldID.setSize(18);
123
        fieldID.setSubSize(0);
123
        fieldID.setSubSize(0);
124
        fieldID.setIsPrimaryKey(true);
124
        fieldID.setIsPrimaryKey(true);
125
        fieldID.setIsIdentity(false);
125
        fieldID.setIsIdentity(false);
Lines 174-180 Link Here
174
        FieldDefinition fieldWORLDID = new FieldDefinition();
174
        FieldDefinition fieldWORLDID = new FieldDefinition();
175
        fieldWORLDID.setName("WORLD_ID");
175
        fieldWORLDID.setName("WORLD_ID");
176
        fieldWORLDID.setTypeName("NUMBER");
176
        fieldWORLDID.setTypeName("NUMBER");
177
        fieldWORLDID.setSize(19);
177
        fieldWORLDID.setSize(18);
178
        fieldWORLDID.setSubSize(0);
178
        fieldWORLDID.setSubSize(0);
179
        fieldWORLDID.setIsPrimaryKey(false);
179
        fieldWORLDID.setIsPrimaryKey(false);
180
        fieldWORLDID.setIsIdentity(false);
180
        fieldWORLDID.setIsIdentity(false);
Lines 193-199 Link Here
193
        FieldDefinition fieldID = new FieldDefinition();
193
        FieldDefinition fieldID = new FieldDefinition();
194
        fieldID.setName("ID");
194
        fieldID.setName("ID");
195
        fieldID.setTypeName("NUMBER");
195
        fieldID.setTypeName("NUMBER");
196
        fieldID.setSize(19);
196
        fieldID.setSize(18);
197
        fieldID.setSubSize(0);
197
        fieldID.setSubSize(0);
198
        fieldID.setIsPrimaryKey(true);
198
        fieldID.setIsPrimaryKey(true);
199
        fieldID.setIsIdentity(false);
199
        fieldID.setIsIdentity(false);
Lines 259-265 Link Here
259
        FieldDefinition fieldTEAMID = new FieldDefinition();
259
        FieldDefinition fieldTEAMID = new FieldDefinition();
260
        fieldTEAMID.setName("TEAM_ID");
260
        fieldTEAMID.setName("TEAM_ID");
261
        fieldTEAMID.setTypeName("NUMBER");
261
        fieldTEAMID.setTypeName("NUMBER");
262
        fieldTEAMID.setSize(19);
262
        fieldTEAMID.setSize(18);
263
        fieldTEAMID.setSubSize(0);
263
        fieldTEAMID.setSubSize(0);
264
        fieldTEAMID.setIsPrimaryKey(false);
264
        fieldTEAMID.setIsPrimaryKey(false);
265
        fieldTEAMID.setIsIdentity(false);
265
        fieldTEAMID.setIsIdentity(false);
Lines 278-284 Link Here
278
        FieldDefinition fieldID = new FieldDefinition();
278
        FieldDefinition fieldID = new FieldDefinition();
279
        fieldID.setName("PLAYERID");
279
        fieldID.setName("PLAYERID");
280
        fieldID.setTypeName("NUMBER");
280
        fieldID.setTypeName("NUMBER");
281
        fieldID.setSize(19);
281
        fieldID.setSize(18);
282
        fieldID.setSubSize(0);
282
        fieldID.setSubSize(0);
283
        fieldID.setIsPrimaryKey(true);
283
        fieldID.setIsPrimaryKey(true);
284
        fieldID.setIsIdentity(false);
284
        fieldID.setIsIdentity(false);
Lines 366-372 Link Here
366
        FieldDefinition fieldTEAMID = new FieldDefinition();
366
        FieldDefinition fieldTEAMID = new FieldDefinition();
367
        fieldTEAMID.setName("TEAM_ID");
367
        fieldTEAMID.setName("TEAM_ID");
368
        fieldTEAMID.setTypeName("NUMBER");
368
        fieldTEAMID.setTypeName("NUMBER");
369
        fieldTEAMID.setSize(19);
369
        fieldTEAMID.setSize(18);
370
        fieldTEAMID.setSubSize(0);
370
        fieldTEAMID.setSubSize(0);
371
        fieldTEAMID.setIsPrimaryKey(false);
371
        fieldTEAMID.setIsPrimaryKey(false);
372
        fieldTEAMID.setIsIdentity(false);
372
        fieldTEAMID.setIsIdentity(false);
Lines 385-391 Link Here
385
        FieldDefinition fieldID = new FieldDefinition();
385
        FieldDefinition fieldID = new FieldDefinition();
386
        fieldID.setName("ID");
386
        fieldID.setName("ID");
387
        fieldID.setTypeName("NUMBER");
387
        fieldID.setTypeName("NUMBER");
388
        fieldID.setSize(19);
388
        fieldID.setSize(18);
389
        fieldID.setSubSize(0);
389
        fieldID.setSubSize(0);
390
        fieldID.setIsPrimaryKey(true);
390
        fieldID.setIsPrimaryKey(true);
391
        fieldID.setIsIdentity(false);
391
        fieldID.setIsIdentity(false);
Lines 447-453 Link Here
447
        FieldDefinition fieldPLAYERID = new FieldDefinition();
447
        FieldDefinition fieldPLAYERID = new FieldDefinition();
448
        fieldPLAYERID.setName("PLAYER_ID");
448
        fieldPLAYERID.setName("PLAYER_ID");
449
        fieldPLAYERID.setTypeName("NUMBER");
449
        fieldPLAYERID.setTypeName("NUMBER");
450
        fieldPLAYERID.setSize(19);
450
        fieldPLAYERID.setSize(18);
451
        fieldPLAYERID.setSubSize(0);
451
        fieldPLAYERID.setSubSize(0);
452
        fieldPLAYERID.setIsPrimaryKey(false);
452
        fieldPLAYERID.setIsPrimaryKey(false);
453
        fieldPLAYERID.setIsIdentity(false);
453
        fieldPLAYERID.setIsIdentity(false);
Lines 459-465 Link Here
459
        FieldDefinition fieldROLEID = new FieldDefinition();
459
        FieldDefinition fieldROLEID = new FieldDefinition();
460
        fieldROLEID.setName("ROLE_ID");
460
        fieldROLEID.setName("ROLE_ID");
461
        fieldROLEID.setTypeName("NUMBER");
461
        fieldROLEID.setTypeName("NUMBER");
462
        fieldROLEID.setSize(19);
462
        fieldROLEID.setSize(18);
463
        fieldROLEID.setSubSize(0);
463
        fieldROLEID.setSubSize(0);
464
        fieldROLEID.setIsPrimaryKey(false);
464
        fieldROLEID.setIsPrimaryKey(false);
465
        fieldROLEID.setIsIdentity(false);
465
        fieldROLEID.setIsIdentity(false);
Lines 478-484 Link Here
478
        FieldDefinition fieldID = new FieldDefinition();
478
        FieldDefinition fieldID = new FieldDefinition();
479
        fieldID.setName("ID");
479
        fieldID.setName("ID");
480
        fieldID.setTypeName("NUMBER");
480
        fieldID.setTypeName("NUMBER");
481
        fieldID.setSize(19);
481
        fieldID.setSize(18);
482
        fieldID.setSubSize(0);
482
        fieldID.setSubSize(0);
483
        fieldID.setIsPrimaryKey(true);
483
        fieldID.setIsPrimaryKey(true);
484
        fieldID.setIsIdentity(false);
484
        fieldID.setIsIdentity(false);
Lines 507-513 Link Here
507
        FieldDefinition fieldID = new FieldDefinition();
507
        FieldDefinition fieldID = new FieldDefinition();
508
        fieldID.setName("ID");
508
        fieldID.setName("ID");
509
        fieldID.setTypeName("NUMBER");
509
        fieldID.setTypeName("NUMBER");
510
        fieldID.setSize(19);
510
        fieldID.setSize(18);
511
        fieldID.setSubSize(0);
511
        fieldID.setSubSize(0);
512
        fieldID.setIsPrimaryKey(true);
512
        fieldID.setIsPrimaryKey(true);
513
        fieldID.setIsIdentity(false);
513
        fieldID.setIsIdentity(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/datatypes/DataTypesTableCreator.java (-4 / +4 lines)
Lines 91-97 Link Here
91
        FieldDefinition fieldLONGDATA = new FieldDefinition();
91
        FieldDefinition fieldLONGDATA = new FieldDefinition();
92
        fieldLONGDATA.setName("LONG_DATA");
92
        fieldLONGDATA.setName("LONG_DATA");
93
        fieldLONGDATA.setTypeName("NUMERIC");
93
        fieldLONGDATA.setTypeName("NUMERIC");
94
        fieldLONGDATA.setSize(19);
94
        fieldLONGDATA.setSize(18);
95
        fieldLONGDATA.setIsPrimaryKey(false);
95
        fieldLONGDATA.setIsPrimaryKey(false);
96
        fieldLONGDATA.setIsIdentity(false);
96
        fieldLONGDATA.setIsIdentity(false);
97
        fieldLONGDATA.setUnique(false);
97
        fieldLONGDATA.setUnique(false);
Lines 147-153 Link Here
147
        FieldDefinition fieldBIGDECIMALDATA = new FieldDefinition();
147
        FieldDefinition fieldBIGDECIMALDATA = new FieldDefinition();
148
        fieldBIGDECIMALDATA.setName("BIGDECIMAL_DATA");
148
        fieldBIGDECIMALDATA.setName("BIGDECIMAL_DATA");
149
        fieldBIGDECIMALDATA.setTypeName("NUMERIC");
149
        fieldBIGDECIMALDATA.setTypeName("NUMERIC");
150
        fieldBIGDECIMALDATA.setSize(38);
150
        fieldBIGDECIMALDATA.setSize(18);
151
        fieldBIGDECIMALDATA.setSubSize(0);
151
        fieldBIGDECIMALDATA.setSubSize(0);
152
        fieldBIGDECIMALDATA.setIsPrimaryKey(false);
152
        fieldBIGDECIMALDATA.setIsPrimaryKey(false);
153
        fieldBIGDECIMALDATA.setIsIdentity(false);
153
        fieldBIGDECIMALDATA.setIsIdentity(false);
Lines 158-164 Link Here
158
        FieldDefinition fieldBIGINTEGERDATA = new FieldDefinition();
158
        FieldDefinition fieldBIGINTEGERDATA = new FieldDefinition();
159
        fieldBIGINTEGERDATA.setName("BIGINTEGER_DATA");
159
        fieldBIGINTEGERDATA.setName("BIGINTEGER_DATA");
160
        fieldBIGINTEGERDATA.setTypeName("NUMERIC");
160
        fieldBIGINTEGERDATA.setTypeName("NUMERIC");
161
        fieldBIGINTEGERDATA.setSize(38);
161
        fieldBIGINTEGERDATA.setSize(18);
162
        fieldBIGINTEGERDATA.setSubSize(0);
162
        fieldBIGINTEGERDATA.setSubSize(0);
163
        fieldBIGINTEGERDATA.setIsPrimaryKey(false);
163
        fieldBIGINTEGERDATA.setIsPrimaryKey(false);
164
        fieldBIGINTEGERDATA.setIsIdentity(false);
164
        fieldBIGINTEGERDATA.setIsIdentity(false);
Lines 215-221 Link Here
215
        FieldDefinition fieldLONGDATA = new FieldDefinition();
215
        FieldDefinition fieldLONGDATA = new FieldDefinition();
216
        fieldLONGDATA.setName("LONG_DATA");
216
        fieldLONGDATA.setName("LONG_DATA");
217
        fieldLONGDATA.setTypeName("NUMERIC");
217
        fieldLONGDATA.setTypeName("NUMERIC");
218
        fieldLONGDATA.setSize(19);
218
        fieldLONGDATA.setSize(18);
219
        fieldLONGDATA.setIsPrimaryKey(false);
219
        fieldLONGDATA.setIsPrimaryKey(false);
220
        fieldLONGDATA.setIsIdentity(false);
220
        fieldLONGDATA.setIsIdentity(false);
221
        fieldLONGDATA.setUnique(false);
221
        fieldLONGDATA.setUnique(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/fieldaccess/advanced/AdvancedTableCreator.java (-3 / +3 lines)
Lines 694-700 Link Here
694
        FieldDefinition field1 = new FieldDefinition();
694
        FieldDefinition field1 = new FieldDefinition();
695
        field1.setName("BUDGET");
695
        field1.setName("BUDGET");
696
        field1.setTypeName("DOUBLE PRECIS");
696
        field1.setTypeName("DOUBLE PRECIS");
697
        field1.setSize(32);
697
        field1.setSize(18);
698
        field1.setShouldAllowNull(true );
698
        field1.setShouldAllowNull(true );
699
        field1.setIsPrimaryKey(false );
699
        field1.setIsPrimaryKey(false );
700
        field1.setUnique(false );
700
        field1.setUnique(false );
Lines 919-925 Link Here
919
        FieldDefinition field1 = new FieldDefinition();
919
        FieldDefinition field1 = new FieldDefinition();
920
        field1.setName("PURCHASES");
920
        field1.setName("PURCHASES");
921
        field1.setTypeName("DOUBLE PRECIS");
921
        field1.setTypeName("DOUBLE PRECIS");
922
        field1.setSize(32);
922
        field1.setSize(18);
923
        field1.setShouldAllowNull(true );
923
        field1.setShouldAllowNull(true );
924
        field1.setIsPrimaryKey(false );
924
        field1.setIsPrimaryKey(false );
925
        field1.setUnique(false );
925
        field1.setUnique(false );
Lines 1139-1145 Link Here
1139
        FieldDefinition fieldCOST = new FieldDefinition();
1139
        FieldDefinition fieldCOST = new FieldDefinition();
1140
        fieldCOST.setName("COST");
1140
        fieldCOST.setName("COST");
1141
        fieldCOST.setTypeName("DOUBLE PRECIS");
1141
        fieldCOST.setTypeName("DOUBLE PRECIS");
1142
        fieldCOST.setSize(32);
1142
        fieldCOST.setSize(18);
1143
        table.addField(fieldCOST);
1143
        table.addField(fieldCOST);
1144
1144
1145
        FieldDefinition fieldTAGS = new FieldDefinition();
1145
        FieldDefinition fieldTAGS = new FieldDefinition();
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/inheritance/InheritanceTableCreator.java (-1 / +3 lines)
Lines 1671-1677 Link Here
1671
     */
1671
     */
1672
    public void replaceTables(DatabaseSession session) {
1672
    public void replaceTables(DatabaseSession session) {
1673
        try {
1673
        try {
1674
            session.executeNonSelectingSQL("Alter table CMP3_ENGINEER_LAPTOP drop constraint CMP3_ENGINEER_LAPTOP_FK1");
1674
            if (session.getPlatform().supportsUniqueKeyConstraints()){
1675
                session.executeNonSelectingSQL("Alter table CMP3_ENGINEER_LAPTOP drop constraint CMP3_ENGINEER_LAPTOP_FK1");
1676
            }
1675
        } catch (Exception ignore) {}
1677
        } catch (Exception ignore) {}
1676
        super.replaceTables(session);
1678
        super.replaceTables(session);
1677
    }
1679
    }
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/lob/LobTableCreator.java (-1 / +1 lines)
Lines 53-59 Link Here
53
        FieldDefinition fieldID = new FieldDefinition();
53
        FieldDefinition fieldID = new FieldDefinition();
54
        fieldID.setName("ID");
54
        fieldID.setName("ID");
55
        fieldID.setTypeName("NUMBER");
55
        fieldID.setTypeName("NUMBER");
56
        fieldID.setSize(38);
56
        fieldID.setSize(18);
57
        fieldID.setSubSize(0);
57
        fieldID.setSubSize(0);
58
        fieldID.setIsPrimaryKey(true);
58
        fieldID.setIsPrimaryKey(true);
59
        fieldID.setIsIdentity(false);
59
        fieldID.setIsIdentity(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/orphanremoval/OrphanRemovalModelTableCreator.java (-3 / +3 lines)
Lines 47-53 Link Here
47
        FieldDefinition serialNumber = new FieldDefinition();
47
        FieldDefinition serialNumber = new FieldDefinition();
48
        serialNumber.setName("SERIALNUMBER");
48
        serialNumber.setName("SERIALNUMBER");
49
        serialNumber.setTypeName("NUMERIC");
49
        serialNumber.setTypeName("NUMERIC");
50
        serialNumber.setSize(19);
50
        serialNumber.setSize(18);
51
        serialNumber.setSubSize(0);
51
        serialNumber.setSubSize(0);
52
        serialNumber.setIsPrimaryKey(false);
52
        serialNumber.setIsPrimaryKey(false);
53
        serialNumber.setIsIdentity(false);
53
        serialNumber.setIsIdentity(false);
Lines 145-151 Link Here
145
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
145
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
146
        fieldSERIALNUMBER.setName("SERIALNUMBER");
146
        fieldSERIALNUMBER.setName("SERIALNUMBER");
147
        fieldSERIALNUMBER.setTypeName("NUMERIC");
147
        fieldSERIALNUMBER.setTypeName("NUMERIC");
148
        fieldSERIALNUMBER.setSize(19);
148
        fieldSERIALNUMBER.setSize(18);
149
        fieldSERIALNUMBER.setSubSize(0);
149
        fieldSERIALNUMBER.setSubSize(0);
150
        fieldSERIALNUMBER.setIsPrimaryKey(false);
150
        fieldSERIALNUMBER.setIsPrimaryKey(false);
151
        fieldSERIALNUMBER.setIsIdentity(false);
151
        fieldSERIALNUMBER.setIsIdentity(false);
Lines 175-181 Link Here
175
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
175
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
176
        fieldSERIALNUMBER.setName("SERIALNUMBER");
176
        fieldSERIALNUMBER.setName("SERIALNUMBER");
177
        fieldSERIALNUMBER.setTypeName("NUMERIC");
177
        fieldSERIALNUMBER.setTypeName("NUMERIC");
178
        fieldSERIALNUMBER.setSize(19);
178
        fieldSERIALNUMBER.setSize(18);
179
        fieldSERIALNUMBER.setSubSize(0);
179
        fieldSERIALNUMBER.setSubSize(0);
180
        fieldSERIALNUMBER.setIsPrimaryKey(false);
180
        fieldSERIALNUMBER.setIsPrimaryKey(false);
181
        fieldSERIALNUMBER.setIsIdentity(false);
181
        fieldSERIALNUMBER.setIsIdentity(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/performance/EmployeeTableCreator.java (-1 / +1 lines)
Lines 276-282 Link Here
276
        FieldDefinition field1 = new FieldDefinition();
276
        FieldDefinition field1 = new FieldDefinition();
277
        field1.setName("BUDGET");
277
        field1.setName("BUDGET");
278
        field1.setTypeName("DOUBLE PRECIS");
278
        field1.setTypeName("DOUBLE PRECIS");
279
        field1.setSize(32);
279
        field1.setSize(18);
280
        field1.setShouldAllowNull(true);
280
        field1.setShouldAllowNull(true);
281
        field1.setIsPrimaryKey(false);
281
        field1.setIsPrimaryKey(false);
282
        field1.setUnique(false);
282
        field1.setUnique(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/privateowned/PrivateOwnedModelTableCreator.java (-4 / +4 lines)
Lines 46-52 Link Here
46
        FieldDefinition serialNumber = new FieldDefinition();
46
        FieldDefinition serialNumber = new FieldDefinition();
47
        serialNumber.setName("SERIALNUMBER");
47
        serialNumber.setName("SERIALNUMBER");
48
        serialNumber.setTypeName("NUMERIC");
48
        serialNumber.setTypeName("NUMERIC");
49
        serialNumber.setSize(19);
49
        serialNumber.setSize(18);
50
        serialNumber.setSubSize(0);
50
        serialNumber.setSubSize(0);
51
        serialNumber.setIsPrimaryKey(false);
51
        serialNumber.setIsPrimaryKey(false);
52
        serialNumber.setIsIdentity(false);
52
        serialNumber.setIsIdentity(false);
Lines 145-151 Link Here
145
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
145
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
146
        fieldSERIALNUMBER.setName("SERIALNUMBER");
146
        fieldSERIALNUMBER.setName("SERIALNUMBER");
147
        fieldSERIALNUMBER.setTypeName("NUMERIC");
147
        fieldSERIALNUMBER.setTypeName("NUMERIC");
148
        fieldSERIALNUMBER.setSize(19);
148
        fieldSERIALNUMBER.setSize(18);
149
        fieldSERIALNUMBER.setSubSize(0);
149
        fieldSERIALNUMBER.setSubSize(0);
150
        fieldSERIALNUMBER.setIsPrimaryKey(false);
150
        fieldSERIALNUMBER.setIsPrimaryKey(false);
151
        fieldSERIALNUMBER.setIsIdentity(false);
151
        fieldSERIALNUMBER.setIsIdentity(false);
Lines 175-181 Link Here
175
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
175
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
176
        fieldSERIALNUMBER.setName("SERIALNUMBER");
176
        fieldSERIALNUMBER.setName("SERIALNUMBER");
177
        fieldSERIALNUMBER.setTypeName("NUMERIC");
177
        fieldSERIALNUMBER.setTypeName("NUMERIC");
178
        fieldSERIALNUMBER.setSize(19);
178
        fieldSERIALNUMBER.setSize(18);
179
        fieldSERIALNUMBER.setSubSize(0);
179
        fieldSERIALNUMBER.setSubSize(0);
180
        fieldSERIALNUMBER.setIsPrimaryKey(false);
180
        fieldSERIALNUMBER.setIsPrimaryKey(false);
181
        fieldSERIALNUMBER.setIsIdentity(false);
181
        fieldSERIALNUMBER.setIsIdentity(false);
Lines 225-231 Link Here
225
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
225
        FieldDefinition fieldSERIALNUMBER = new FieldDefinition();
226
        fieldSERIALNUMBER.setName("SERIALNUMBER");
226
        fieldSERIALNUMBER.setName("SERIALNUMBER");
227
        fieldSERIALNUMBER.setTypeName("NUMERIC");
227
        fieldSERIALNUMBER.setTypeName("NUMERIC");
228
        fieldSERIALNUMBER.setSize(19);
228
        fieldSERIALNUMBER.setSize(18);
229
        fieldSERIALNUMBER.setSubSize(0);
229
        fieldSERIALNUMBER.setSubSize(0);
230
        fieldSERIALNUMBER.setIsPrimaryKey(false);
230
        fieldSERIALNUMBER.setIsPrimaryKey(false);
231
        fieldSERIALNUMBER.setIsIdentity(false);
231
        fieldSERIALNUMBER.setIsIdentity(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/relationships/Customer.java (-1 / +1 lines)
Lines 49-55 Link Here
49
    @Id
49
    @Id
50
    @GeneratedValue(strategy=TABLE, generator="CUSTOMER_TABLE_GENERATOR")
50
    @GeneratedValue(strategy=TABLE, generator="CUSTOMER_TABLE_GENERATOR")
51
    @TableGenerator(
51
    @TableGenerator(
52
        name="CUSTOMER_GENERATOR_TABLE", 
52
        name="CUSTOMER_TABLE_GENERATOR", 
53
        table="CMP3_CUSTOMER_SEQ", 
53
        table="CMP3_CUSTOMER_SEQ", 
54
        pkColumnName="SEQ_NAME", 
54
        pkColumnName="SEQ_NAME", 
55
        valueColumnName="SEQ_COUNT",
55
        valueColumnName="SEQ_COUNT",
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/relationships/Lego.java (-1 / +1 lines)
Lines 32-38 Link Here
32
    @Id
32
    @Id
33
    @GeneratedValue(strategy=TABLE, generator="MANUFACTURER_TABLE_GENERATOR")
33
    @GeneratedValue(strategy=TABLE, generator="MANUFACTURER_TABLE_GENERATOR")
34
    @TableGenerator(
34
    @TableGenerator(
35
        name="MANUFACTURER_GENERATOR_TABLE", 
35
        name="MANUFACTURER_TABLE_GENERATOR", 
36
        table="CMP3_MANUFACTURER_SEQ", 
36
        table="CMP3_MANUFACTURER_SEQ", 
37
        pkColumnName="SEQ_NAME", 
37
        pkColumnName="SEQ_NAME", 
38
        valueColumnName="SEQ_COUNT",
38
        valueColumnName="SEQ_COUNT",
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/relationships/MegaBrands.java (-1 / +1 lines)
Lines 32-38 Link Here
32
    @Id
32
    @Id
33
    @GeneratedValue(strategy=TABLE, generator="DISTRIBUTOR_TABLE_GENERATOR")
33
    @GeneratedValue(strategy=TABLE, generator="DISTRIBUTOR_TABLE_GENERATOR")
34
    @TableGenerator(
34
    @TableGenerator(
35
        name="DISTRIBUTOR_GENERATOR_TABLE", 
35
        name="DISTRIBUTOR_TABLE_GENERATOR", 
36
        table="CMP3_DISTRIBUTOR_SEQ", 
36
        table="CMP3_DISTRIBUTOR_SEQ", 
37
        pkColumnName="SEQ_NAME", 
37
        pkColumnName="SEQ_NAME", 
38
        valueColumnName="SEQ_COUNT",
38
        valueColumnName="SEQ_COUNT",
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/advanced/AdvancedTableCreator.java (-1 / +1 lines)
Lines 561-567 Link Here
561
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
561
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
562
        field1.setName("BUDGET");
562
        field1.setName("BUDGET");
563
        field1.setTypeName("DOUBLE PRECIS");
563
        field1.setTypeName("DOUBLE PRECIS");
564
        field1.setSize(32);
564
        field1.setSize(18);
565
        field1.setShouldAllowNull(true );
565
        field1.setShouldAllowNull(true );
566
        field1.setIsPrimaryKey(false );
566
        field1.setIsPrimaryKey(false );
567
        field1.setUnique(false );
567
        field1.setUnique(false );
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/complexaggregate/ComplexAggregateTableCreator.java (-11 / +11 lines)
Lines 44-50 Link Here
44
        FieldDefinition fieldID = new FieldDefinition();
44
        FieldDefinition fieldID = new FieldDefinition();
45
        fieldID.setName("ID");
45
        fieldID.setName("ID");
46
        fieldID.setTypeName("NUMBER");
46
        fieldID.setTypeName("NUMBER");
47
        fieldID.setSize(19);
47
        fieldID.setSize(18);
48
        fieldID.setSubSize(0);
48
        fieldID.setSubSize(0);
49
        fieldID.setIsPrimaryKey(true);
49
        fieldID.setIsPrimaryKey(true);
50
        fieldID.setIsIdentity(true);
50
        fieldID.setIsIdentity(true);
Lines 99-105 Link Here
99
        FieldDefinition fieldWORLDID = new FieldDefinition();
99
        FieldDefinition fieldWORLDID = new FieldDefinition();
100
        fieldWORLDID.setName("WORLD_ID");
100
        fieldWORLDID.setName("WORLD_ID");
101
        fieldWORLDID.setTypeName("NUMBER");
101
        fieldWORLDID.setTypeName("NUMBER");
102
        fieldWORLDID.setSize(19);
102
        fieldWORLDID.setSize(18);
103
        fieldWORLDID.setSubSize(0);
103
        fieldWORLDID.setSubSize(0);
104
        fieldWORLDID.setIsPrimaryKey(false);
104
        fieldWORLDID.setIsPrimaryKey(false);
105
        fieldWORLDID.setIsIdentity(false);
105
        fieldWORLDID.setIsIdentity(false);
Lines 118-124 Link Here
118
        FieldDefinition fieldID = new FieldDefinition();
118
        FieldDefinition fieldID = new FieldDefinition();
119
        fieldID.setName("ID");
119
        fieldID.setName("ID");
120
        fieldID.setTypeName("NUMBER");
120
        fieldID.setTypeName("NUMBER");
121
        fieldID.setSize(19);
121
        fieldID.setSize(18);
122
        fieldID.setSubSize(0);
122
        fieldID.setSubSize(0);
123
        fieldID.setIsPrimaryKey(true);
123
        fieldID.setIsPrimaryKey(true);
124
        fieldID.setIsIdentity(false);
124
        fieldID.setIsIdentity(false);
Lines 173-179 Link Here
173
        FieldDefinition fieldWORLDID = new FieldDefinition();
173
        FieldDefinition fieldWORLDID = new FieldDefinition();
174
        fieldWORLDID.setName("WORLD_ID");
174
        fieldWORLDID.setName("WORLD_ID");
175
        fieldWORLDID.setTypeName("NUMBER");
175
        fieldWORLDID.setTypeName("NUMBER");
176
        fieldWORLDID.setSize(19);
176
        fieldWORLDID.setSize(18);
177
        fieldWORLDID.setSubSize(0);
177
        fieldWORLDID.setSubSize(0);
178
        fieldWORLDID.setIsPrimaryKey(false);
178
        fieldWORLDID.setIsPrimaryKey(false);
179
        fieldWORLDID.setIsIdentity(false);
179
        fieldWORLDID.setIsIdentity(false);
Lines 192-198 Link Here
192
        FieldDefinition fieldID = new FieldDefinition();
192
        FieldDefinition fieldID = new FieldDefinition();
193
        fieldID.setName("PLAYERID");
193
        fieldID.setName("PLAYERID");
194
        fieldID.setTypeName("NUMBER");
194
        fieldID.setTypeName("NUMBER");
195
        fieldID.setSize(19);
195
        fieldID.setSize(18);
196
        fieldID.setSubSize(0);
196
        fieldID.setSubSize(0);
197
        fieldID.setIsPrimaryKey(true);
197
        fieldID.setIsPrimaryKey(true);
198
        fieldID.setIsIdentity(false);
198
        fieldID.setIsIdentity(false);
Lines 375-381 Link Here
375
        FieldDefinition fieldOWNERID = new FieldDefinition();
375
        FieldDefinition fieldOWNERID = new FieldDefinition();
376
        fieldOWNERID.setName("OWNER_ID");
376
        fieldOWNERID.setName("OWNER_ID");
377
        fieldOWNERID.setTypeName("NUMBER");
377
        fieldOWNERID.setTypeName("NUMBER");
378
        fieldOWNERID.setSize(19);
378
        fieldOWNERID.setSize(18);
379
        fieldOWNERID.setSubSize(0);
379
        fieldOWNERID.setSubSize(0);
380
        fieldOWNERID.setIsPrimaryKey(false);
380
        fieldOWNERID.setIsPrimaryKey(false);
381
        fieldOWNERID.setIsIdentity(false);
381
        fieldOWNERID.setIsIdentity(false);
Lines 394-400 Link Here
394
        FieldDefinition fieldID = new FieldDefinition();
394
        FieldDefinition fieldID = new FieldDefinition();
395
        fieldID.setName("ID");
395
        fieldID.setName("ID");
396
        fieldID.setTypeName("NUMBER");
396
        fieldID.setTypeName("NUMBER");
397
        fieldID.setSize(19);
397
        fieldID.setSize(18);
398
        fieldID.setSubSize(0);
398
        fieldID.setSubSize(0);
399
        fieldID.setIsPrimaryKey(true);
399
        fieldID.setIsPrimaryKey(true);
400
        fieldID.setIsIdentity(false);
400
        fieldID.setIsIdentity(false);
Lines 433-439 Link Here
433
        FieldDefinition fieldPLAYERID = new FieldDefinition();
433
        FieldDefinition fieldPLAYERID = new FieldDefinition();
434
        fieldPLAYERID.setName("PLAYER_ID");
434
        fieldPLAYERID.setName("PLAYER_ID");
435
        fieldPLAYERID.setTypeName("NUMBER");
435
        fieldPLAYERID.setTypeName("NUMBER");
436
        fieldPLAYERID.setSize(19);
436
        fieldPLAYERID.setSize(18);
437
        fieldPLAYERID.setSubSize(0);
437
        fieldPLAYERID.setSubSize(0);
438
        fieldPLAYERID.setIsPrimaryKey(false);
438
        fieldPLAYERID.setIsPrimaryKey(false);
439
        fieldPLAYERID.setIsIdentity(false);
439
        fieldPLAYERID.setIsIdentity(false);
Lines 445-451 Link Here
445
        FieldDefinition fieldROLEID = new FieldDefinition();
445
        FieldDefinition fieldROLEID = new FieldDefinition();
446
        fieldROLEID.setName("ROLE_ID");
446
        fieldROLEID.setName("ROLE_ID");
447
        fieldROLEID.setTypeName("NUMBER");
447
        fieldROLEID.setTypeName("NUMBER");
448
        fieldROLEID.setSize(19);
448
        fieldROLEID.setSize(18);
449
        fieldROLEID.setSubSize(0);
449
        fieldROLEID.setSubSize(0);
450
        fieldROLEID.setIsPrimaryKey(false);
450
        fieldROLEID.setIsPrimaryKey(false);
451
        fieldROLEID.setIsIdentity(false);
451
        fieldROLEID.setIsIdentity(false);
Lines 464-470 Link Here
464
        FieldDefinition fieldID = new FieldDefinition();
464
        FieldDefinition fieldID = new FieldDefinition();
465
        fieldID.setName("ID");
465
        fieldID.setName("ID");
466
        fieldID.setTypeName("NUMBER");
466
        fieldID.setTypeName("NUMBER");
467
        fieldID.setSize(19);
467
        fieldID.setSize(18);
468
        fieldID.setSubSize(0);
468
        fieldID.setSubSize(0);
469
        fieldID.setIsPrimaryKey(true);
469
        fieldID.setIsPrimaryKey(true);
470
        fieldID.setIsIdentity(false);
470
        fieldID.setIsIdentity(false);
Lines 521-527 Link Here
521
        FieldDefinition fieldID = new FieldDefinition();
521
        FieldDefinition fieldID = new FieldDefinition();
522
        fieldID.setName("ID");
522
        fieldID.setName("ID");
523
        fieldID.setTypeName("NUMBER");
523
        fieldID.setTypeName("NUMBER");
524
        fieldID.setSize(19);
524
        fieldID.setSize(18);
525
        fieldID.setSubSize(0);
525
        fieldID.setSubSize(0);
526
        fieldID.setIsPrimaryKey(true);
526
        fieldID.setIsPrimaryKey(true);
527
        fieldID.setIsIdentity(false);
527
        fieldID.setIsIdentity(false);
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/merge/incompletemappings/owning/AdvancedTableCreator.java (-1 / +1 lines)
Lines 262-268 Link Here
262
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
262
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
263
        field1.setName("BUDGET");
263
        field1.setName("BUDGET");
264
        field1.setTypeName("DOUBLE PRECIS");
264
        field1.setTypeName("DOUBLE PRECIS");
265
        field1.setSize(32);
265
        field1.setSize(18);
266
        field1.setShouldAllowNull(true );
266
        field1.setShouldAllowNull(true );
267
        field1.setIsPrimaryKey(false );
267
        field1.setIsPrimaryKey(false );
268
        field1.setUnique(false );
268
        field1.setUnique(false );
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/models/jpa/xml/relationships/unidirectional/AdvancedTableCreator.java (-1 / +1 lines)
Lines 280-286 Link Here
280
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
280
        org.eclipse.persistence.tools.schemaframework.FieldDefinition field1 = new org.eclipse.persistence.tools.schemaframework.FieldDefinition();
281
        field1.setName("BUDGET");
281
        field1.setName("BUDGET");
282
        field1.setTypeName("DOUBLE PRECIS");
282
        field1.setTypeName("DOUBLE PRECIS");
283
        field1.setSize(32);
283
        field1.setSize(18);
284
        field1.setShouldAllowNull(true );
284
        field1.setShouldAllowNull(true );
285
        field1.setIsPrimaryKey(false );
285
        field1.setIsPrimaryKey(false );
286
        field1.setUnique(false );
286
        field1.setUnique(false );
(-)jpa/eclipselink.jpa.test/src/org/eclipse/persistence/testing/tests/jpa/metamodel/MetamodelTableCreator.java (-6 / +6 lines)
Lines 928-934 Link Here
928
/*        FieldDefinition fieldID = new FieldDefinition();
928
/*        FieldDefinition fieldID = new FieldDefinition();
929
        fieldID.setName("GALACTIC_ID");
929
        fieldID.setName("GALACTIC_ID");
930
        fieldID.setTypeName("NUMBER");
930
        fieldID.setTypeName("NUMBER");
931
        fieldID.setSize(19);
931
        fieldID.setSize(18);
932
        fieldID.setSubSize(0);
932
        fieldID.setSubSize(0);
933
        fieldID.setIsPrimaryKey(true);
933
        fieldID.setIsPrimaryKey(true);
934
        fieldID.setIsIdentity(true);
934
        fieldID.setIsIdentity(true);
Lines 950-956 Link Here
950
        /*FieldDefinition fieldID2 = new FieldDefinition();
950
        /*FieldDefinition fieldID2 = new FieldDefinition();
951
        fieldID2.setName("PK_PART2");
951
        fieldID2.setName("PK_PART2");
952
        fieldID2.setTypeName("NUMBER");
952
        fieldID2.setTypeName("NUMBER");
953
        fieldID2.setSize(19);
953
        fieldID2.setSize(18);
954
        fieldID2.setSubSize(0);
954
        fieldID2.setSubSize(0);
955
        fieldID2.setIsPrimaryKey(true);
955
        fieldID2.setIsPrimaryKey(true);
956
        fieldID2.setIsIdentity(true);
956
        fieldID2.setIsIdentity(true);
Lines 1019-1025 Link Here
1019
/*        FieldDefinition fieldID = new FieldDefinition();
1019
/*        FieldDefinition fieldID = new FieldDefinition();
1020
        fieldID.setName("LOCATION_ID");
1020
        fieldID.setName("LOCATION_ID");
1021
        fieldID.setTypeName("NUMBER");
1021
        fieldID.setTypeName("NUMBER");
1022
        fieldID.setSize(19);
1022
        fieldID.setSize(18);
1023
        fieldID.setSubSize(0);
1023
        fieldID.setSubSize(0);
1024
        fieldID.setIsPrimaryKey(true);
1024
        fieldID.setIsPrimaryKey(true);
1025
        fieldID.setIsIdentity(true);
1025
        fieldID.setIsIdentity(true);
Lines 1030-1036 Link Here
1030
        /*FieldDefinition fieldID = new FieldDefinition();
1030
        /*FieldDefinition fieldID = new FieldDefinition();
1031
        fieldID.setName("PK_PART1");
1031
        fieldID.setName("PK_PART1");
1032
        fieldID.setTypeName("NUMBER");
1032
        fieldID.setTypeName("NUMBER");
1033
        fieldID.setSize(19);
1033
        fieldID.setSize(18);
1034
        fieldID.setSubSize(0);
1034
        fieldID.setSubSize(0);
1035
        fieldID.setIsPrimaryKey(true);
1035
        fieldID.setIsPrimaryKey(true);
1036
        fieldID.setIsIdentity(true);
1036
        fieldID.setIsIdentity(true);
Lines 1041-1047 Link Here
1041
        /*FieldDefinition fieldID2 = new FieldDefinition();
1041
        /*FieldDefinition fieldID2 = new FieldDefinition();
1042
        fieldID2.setName("PK_PART2");
1042
        fieldID2.setName("PK_PART2");
1043
        fieldID2.setTypeName("NUMBER");
1043
        fieldID2.setTypeName("NUMBER");
1044
        fieldID2.setSize(19);
1044
        fieldID2.setSize(18);
1045
        fieldID2.setSubSize(0);
1045
        fieldID2.setSubSize(0);
1046
        fieldID2.setIsPrimaryKey(true);
1046
        fieldID2.setIsPrimaryKey(true);
1047
        fieldID2.setIsIdentity(true);
1047
        fieldID2.setIsIdentity(true);
Lines 1086-1092 Link Here
1086
        FieldDefinition fieldID = new FieldDefinition();
1086
        FieldDefinition fieldID = new FieldDefinition();
1087
        fieldID.setName("GALACTIC_ID");
1087
        fieldID.setName("GALACTIC_ID");
1088
        fieldID.setTypeName("NUMBER");
1088
        fieldID.setTypeName("NUMBER");
1089
        fieldID.setSize(19);
1089
        fieldID.setSize(18);
1090
        fieldID.setSubSize(0);
1090
        fieldID.setSubSize(0);
1091
        fieldID.setIsPrimaryKey(true);
1091
        fieldID.setIsPrimaryKey(true);
1092
        fieldID.setIsIdentity(true);
1092
        fieldID.setIsIdentity(true);

Return to bug 289023