update mysql.sql

Author: ngbsn

src/main/java/io/github/ngbsn/generator/associations/OneToManyMappingsGenerator.java

@@ -58,7 +58,7 @@ public static void addBiDirectionalMappings(final Table table, final ForeignKeyC
         //Adding JoinColumn and MapsId annotations in below logic
         //Case: Composite Foreign key
         if (foreignKeyConstraint.getColumns().size() > 1) {
-            handleCompositeForeignKey(table, foreignKeyConstraint, parentTableField, embeddableId, allPrimaryKeyColumns);
+            handleCompositeForeignKey(table, parentTable, foreignKeyConstraint, parentTableField, embeddableId, allPrimaryKeyColumns);
 
         }
         //Case: Single Foreign Key
@@ -108,15 +108,15 @@ private static void handleSingleForeignKey(final Table table, final ForeignKeyCo
                 .build().toString());
     }
 
-    private static void handleCompositeForeignKey(final Table table, final ForeignKeyConstraint foreignKeyConstraint, final Column parentTableField,
-                                                  final EmbeddableClass embeddableId, final List<Column> allPrimaryKeyColumns) {
+    private static void handleCompositeForeignKey(final Table table, final Table parentTable, final ForeignKeyConstraint foreignKeyConstraint,
+                                                  final Column parentTableField, final EmbeddableClass embeddableId, final List<Column> allPrimaryKeyColumns) {
         List<Column> listOfForeignKeyColumns = listOfForeignKeys(table, foreignKeyConstraint);
         //Case: Shared Composite Primary Key
         //If composite foreign key is inside the composite primary key, don't remove them from table.
         //This case assumes there is a primary composite key
         //Add a @MapsId annotation to the referenced table field
         if (embeddableId != null && new HashSet<>(allPrimaryKeyColumns).containsAll(listOfForeignKeyColumns)) {
-            handleSharedCompositePrimaryKey(table, parentTableField, embeddableId, listOfForeignKeyColumns);
+            handleCompositeForeignKeyInsideCompositePrimaryKey(table, parentTable, parentTableField, embeddableId, listOfForeignKeyColumns);
         } else {
             //Case1: There is no Composite primary key
             //TODO can part of Composite foreign key be a primary key. Is this applicable only to self referencing cases?
@@ -136,8 +136,8 @@ private static void handleCompositeForeignKey(final Table table, final ForeignKe
         parentTableField.getAnnotations().add(JoinColumnsAnnotation.builder().joinColumns(joinColumns).build().toString());
     }
 
-    private static void handleSharedCompositePrimaryKey(final Table table, final Column parentTableField,
-                                                        final EmbeddableClass embeddableId, final List<Column> listOfForeignKeyColumns) {
+    private static void handleCompositeForeignKeyInsideCompositePrimaryKey(final Table table, final Table parentTable, final Column parentTableField,
+                                                                           final EmbeddableClass embeddableId, final List<Column> listOfForeignKeyColumns) {
 
         EmbeddableClass foreignCompositeKeyEmbedded = new EmbeddableClass(); //Create a new embeddable for this foreign composite key
         String embeddableName = listOfForeignKeyColumns.stream().map(Column::getFieldName).collect(Collectors.joining());

src/main/java/io/github/ngbsn/generator/models/ModelGenerator.java

@@ -157,6 +157,7 @@ private static void processAlterTableStatements(final List<Statement> statements
                         table.getColumns().removeIf(column -> column.getColumnName().equals(alterExpression.getColumnName()));
 
                     } else if (alterExpression.getOperation().name().equals("ADD")){
+                        //TODO check why alterExpression.getColDataTypeList() is a list ?
                         String cName = alterExpression.getColDataTypeList().get(0) != null ? alterExpression.getColDataTypeList().get(0).getColumnName() : null;
                         String columnName = alterExpression.getColumnName() != null ? alterExpression.getColumnName() : cName;
                         String type = alterExpression.getColDataTypeList().get(0) != null ?

src/test/resources/sql/mysql.sql

@@ -8,7 +8,7 @@ CREATE TABLE organization.contractors (
 );
 
 CREATE TABLE organization.employees (
-    emp_no      INT             NOT NULL,
+    emp_no      INT             NOT NULL  AUTO_INCREMENT,
     birth_date  DATE            NOT NULL,
     first_name  VARCHAR(14)     NOT NULL,
     last_name   VARCHAR(16)     NOT NULL,
@@ -18,14 +18,14 @@ CREATE TABLE organization.employees (
 );
 
 CREATE TABLE organization.departments (
-    dept_no     CHAR(4)         NOT NULL,
-    dept_name   VARCHAR(40)     NOT NULL,
+    dept_no     VARCHAR(100)         NOT NULL,
+    dept_name   VARCHAR(100)     NOT NULL,
     PRIMARY KEY (dept_no),
     UNIQUE   	(dept_name)
 );
 
 CREATE TABLE organization.dept_manager (
-   dept_no      CHAR(4)         NOT NULL,
+   dept_no      VARCHAR(100)         NOT NULL,
    emp_no       INT             NOT NULL,
    FOREIGN KEY (emp_no)  REFERENCES organization.employees (emp_no)    ON DELETE CASCADE,
    FOREIGN KEY (dept_no) REFERENCES organization.departments (dept_no) ON DELETE CASCADE,
@@ -36,7 +36,7 @@ CREATE INDEX dept_manager_dept_no_idx ON organization.dept_manager(dept_no);
 
 CREATE TABLE organization.dept_emp (
     emp_no      INT             NOT NULL,
-    dept_no     CHAR(4)         NOT NULL,
+    dept_no     VARCHAR(100)         NOT NULL,
     from_date   DATE            NOT NULL,
     to_date     DATE            NOT NULL,
     FOREIGN KEY (emp_no)  REFERENCES organization.employees   (emp_no)  ON DELETE CASCADE,
@@ -71,4 +71,12 @@ CREATE TABLE organization.contractors_salaries (
     salary          INT             NOT NULL,
     FOREIGN KEY (contractor_no, first_name) REFERENCES organization.contractors (contractor_no, first_name) ON DELETE CASCADE,
     PRIMARY KEY (contractor_no, first_name, salary)
+);
+
+CREATE TABLE organization.contractors_roles (
+    contractor_no   INT             NOT NULL,
+    first_name      VARCHAR(14)     NOT NULL,
+    role          VARCHAR(14)       NOT NULL,
+    FOREIGN KEY (contractor_no, first_name) REFERENCES organization.contractors (contractor_no, first_name) ON DELETE CASCADE,
+    PRIMARY KEY (contractor_no, first_name)
 );