Update - Oracle Schema constraint names

C4J · Aug 10, 2024 · 9da81ef · 9da81ef
1 parent 4252966
commit 9da81ef
Show file tree

Hide file tree

Showing 39 changed files with 209 additions and 241 deletions.
diff --git a/b6/commander4j.jar b/b6/commander4j.jar
diff --git a/b6/src/com/commander4j/cfg/JDialogDMLErrors.java b/b6/src/com/commander4j/cfg/JDialogDMLErrors.java
@@ -221,6 +221,7 @@ public Boolean saveAs(String filename, Component parent)
 						fw.write("Updating from Schema Version "+String.valueOf(updateRequest.schema_CURVersion+" to "+String.valueOf(updateRequest.schema_NEWVersion))+"\n");
 						fw.write("*********************************************************************************************************************************************************\n\n\n");
 						fw.write("---------------------------------------------------------------------------------------------------------------------------------------------------------\n");
+						int errCount = 0;
 						for (int x = 0; x < ddlLocal.size();x++)
 						{            
 							if (ddlLocal.get(x).getError().equals("Success")==false)
@@ -231,9 +232,11 @@ public Boolean saveAs(String filename, Component parent)
 								fw.write("Error Message  : " + ddlLocal.get(x).getError()+"\n");
 								fw.write("---------------------------------------------------------------------------------------------------------------------------------------------------------\n");
 								fw.flush();
+								errCount ++;
 							}
 						}
-						fw.write("\nNo of Errors   : " +String.valueOf(ddlLocal.size())+"\n");
+						fw.write("\nNo of Commands   : " +String.valueOf(ddlLocal.size())+"\n");
+						fw.write("\nNo of Errors     : " +String.valueOf(errCount)+"\n");
 						fw.flush();
 						fw.close();
 

diff --git a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml
@@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` (
   `STATUS` varchar(15) DEFAULT NULL,
   `EXPIRY_DATE` datetime DEFAULT NULL,
   PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`),
-  UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`),
-  CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION
+  UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`)
 )  ENGINE=InnoDB;
 </statement>
 

diff --git a/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml
@@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F
 insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line','');
 </statement>
 
-<statement>
-ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ;
-</statement>
 
 </DDL>
diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml
@@ -7,11 +7,12 @@
 </statement>
 
 <statement>
-	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID")
+	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE
+	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE 
+	                                      ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE
 </statement>
 
 <statement> 

diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000134.xml
@@ -10,11 +10,11 @@
     </statement>
 
     <statement>
-   		 ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008116 PRIMARY KEY (CONTAINER_CODE)
+   		 ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_PK PRIMARY KEY (CONTAINER_CODE)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT SYS_C008115 CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_CONTAINER_CODE ADD CONSTRAINT APP_WEIGHT_CONTAINER_CODE_CHK CHECK (CONTAINER_CODE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>    
 
 	<statement>
@@ -29,11 +29,11 @@
     </statement>
 
     <statement>
-   		 ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008118 PRIMARY KEY (PRODUCT_GROUP)
+   		 ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_PK PRIMARY KEY (PRODUCT_GROUP)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT SYS_C008117 CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_PRODUCT_GROUP ADD CONSTRAINT APP_WEIGHT_PRODUCT_GROUP_CHK CHECK (PRODUCT_GROUP IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>    
 
 	<statement>
@@ -53,19 +53,15 @@
 
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008255 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>
-
-<!--	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008256 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
-    </statement>-->
-
+
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT SYS_C008257 CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE    
+		ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_SEQ_CHK CHECK (SAMPLE_SEQUENCE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE    
     </statement>
 
     <statement>
-        ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE)
+        ALTER TABLE APP_WEIGHT_SAMPLE_DETAIL ADD CONSTRAINT APP_WEIGHT_SAMPLE_DETAIL_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE, SAMPLE_SEQUENCE)
     </statement>
 
 	<statement>
@@ -98,15 +94,15 @@
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008127 PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE)
+		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_PK PRIMARY KEY (SAMPLE_POINT, SAMPLE_DATE)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008125 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT SYS_C008126 CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_SAMPLE_HEADER ADD CONSTRAINT APP_WEIGHT_SAMPLE_HEADER_DATE_CHK CHECK (SAMPLE_DATE IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
      </statement>
 
 	<statement>
@@ -119,11 +115,11 @@
     </statement>
 
 	<statement>    
-		ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008124 PRIMARY KEY (SAMPLE_POINT)
+		ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_PK PRIMARY KEY (SAMPLE_POINT)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT SYS_C008123 CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_SAMPLE_POINT ADD CONSTRAINT APP_WEIGHT_SAMPLE_POINT_CHK CHECK (SAMPLE_POINT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement> 
 
 	<statement>
@@ -143,11 +139,11 @@
     </statement>
 
  	<statement>   
-		ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008129 PRIMARY KEY (SCALE_ID)
+		ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_PK PRIMARY KEY (SCALE_ID)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT SYS_C008128 CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_SCALE ADD CONSTRAINT APP_WEIGHT_SCALE_ID_CHK CHECK (SCALE_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>
 
 	<statement>
@@ -161,15 +157,15 @@
     </statement>
 
   	<statement>  
-    	ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008132 PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM)
+    	ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_PK PRIMARY KEY (NOMINAL_WEIGHT, NOMINAL_WEIGHT_UOM)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008130 CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_NOMINAL_CHK CHECK (NOMINAL_WEIGHT IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT SYS_C008131 CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_TNE ADD CONSTRAINT APP_WEIGHT_TNE_UOM_CHK CHECK (NOMINAL_WEIGHT_UOM IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
     </statement>	    
 
 	<statement>
@@ -184,11 +180,11 @@
     </statement>
 
  	<statement>   
-    	ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008134 PRIMARY KEY (WORKSTATION_ID)
+    	ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_PK PRIMARY KEY (WORKSTATION_ID)
     </statement>
 
 	<statement>
-		ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT SYS_C008133 CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE APP_WEIGHT_WORKSTATION ADD CONSTRAINT APP_WEIGHT_WORKSTATION_ID_CHK CHECK (WORKSTATION_ID IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
      </statement>
 
 </DDL>
diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000171.xml
@@ -25,11 +25,11 @@
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010582" PRIMARY KEY ("PANEL_ID")
+	ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_PK" PRIMARY KEY ("PANEL_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "SYS_C0010581" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL" ADD CONSTRAINT "APP_QM_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
@@ -53,15 +53,15 @@
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010585" PRIMARY KEY ("PANEL_ID", "TRAY_ID")
+	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PK" PRIMARY KEY ("PANEL_ID", "TRAY_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010583" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_PANEL_ID_CHK" CHECK ("PANEL_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "SYS_C0010584" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY" ADD CONSTRAINT "APP_QM_PANEL_TRAY_ID_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
@@ -85,19 +85,19 @@
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010593" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID")
+	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010590" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>		
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010591" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "SYS_C0010592" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_SAMPLES" ADD CONSTRAINT "APP_QM_PANEL_TRAY_SAMPLES_SEQ_CHK" CHECK ("SEQUENCE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
@@ -123,19 +123,19 @@
 </statement>	
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010589" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID")
+	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_PK" PRIMARY KEY ("TRAY_ID", "SAMPLE_ID", "USER_ID")
 </statement>	
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010586" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_TRAY_CHK" CHECK ("TRAY_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>	
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010587" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_ID_CHK" CHECK ("SAMPLE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "SYS_C0010588" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_PANEL_TRAY_RESULTS" ADD CONSTRAINT "APP_QM_PANEL_TRAY_RESULTS_USER_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 <statement>
@@ -158,11 +158,11 @@
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010617" PRIMARY KEY ("USER_ID")
+	ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_PK" PRIMARY KEY ("USER_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "SYS_C0010616" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+	ALTER TABLE "APP_QM_USERS" ADD CONSTRAINT "APP_QM_USERS_ID_CHK" CHECK ("USER_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 </statement>
 
 </DDL>
diff --git a/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml b/b6/xml/schema/oracle.jdbc.driver.OracleDriver/000178.xml
@@ -25,11 +25,11 @@
 	</statement>
 
 	<statement>
-		ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008882" PRIMARY KEY ("PACKING_LINE_ID")
+		ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_PK" PRIMARY KEY ("PACKING_LINE_ID")
 	</statement>
 
 	<statement>
-		ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "SYS_C008881" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
+		ALTER TABLE "APP_PACKING_LINES" ADD CONSTRAINT "APP_PACKING_LINES_ID_CHK" CHECK ("PACKING_LINE_ID" IS NOT NULL) NOT DEFERRABLE INITIALLY IMMEDIATE NORELY VALIDATE
 	</statement>
 
 	<statement>

diff --git a/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar b/b6web_t10_android_eb3/WebContent/WEB-INF/lib/commander4j.jar
diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000000.xml
@@ -77,8 +77,7 @@ CREATE TABLE `APP_MATERIAL_BATCH` (
   `STATUS` varchar(15) DEFAULT NULL,
   `EXPIRY_DATE` datetime DEFAULT NULL,
   PRIMARY KEY (`MATERIAL`,`BATCH_NUMBER`),
-  UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`),
-  CONSTRAINT `sys_c004058` FOREIGN KEY (`material`) REFERENCES `APP_MATERIAL` (`MATERIAL`) ON DELETE NO ACTION ON UPDATE NO ACTION
+  UNIQUE KEY `BATCH_PK` (`MATERIAL`,`BATCH_NUMBER`)
 )  ENGINE=InnoDB;
 </statement>
 

diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml b/b6web_t10_android_eb3/WebContent/xml/schema/com.mysql.cj.jdbc.Driver/000063.xml
@@ -643,8 +643,5 @@ insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_F
 insert into SYS_LANGUAGE (resource_key,language_id,text,mnemonic) values ('mod_FRM_ADMIN_AUTO_LAB_EDIT','IT','Add or Update a Production Line','');
 </statement>
 
-<statement>
-ALTER TABLE `APP_MATERIAL_BATCH` DROP FOREIGN KEY `sys_c004058` ;
-</statement>
 
 </DDL>
diff --git a/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml b/b6web_t10_android_eb3/WebContent/xml/schema/oracle.jdbc.driver.OracleDriver/000106.xml
@@ -7,11 +7,12 @@
 </statement>
 
 <statement>
-	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011435" PRIMARY KEY("MODULE_ID","WORKSTATION_ID")
+	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_PK" PRIMARY KEY("MODULE_ID","WORKSTATION_ID")
 </statement>
 
 <statement>
-	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_C0011433" CHECK ("MODULE_ID" IS NOT NULL) ENABLE ADD CONSTRAINT "SYS_C0011434" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE
+	ALTER TABLE "SYS_MODULES_ALTERNATIVE" ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_MOD_ID_CHK" CHECK ("MODULE_ID" IS NOT NULL) ENABLE 
+	                                      ADD CONSTRAINT "SYS_MODULES_ALTERNATIVE_WKS_ID_CHK" CHECK ("WORKSTATION_ID" IS NOT NULL) ENABLE
 </statement>
 
 <statement>