Merge branch 'master' into desku

# Conflicts:
#	core/src/main/java/com/osiris/jsqlgen/Main.java
#	src/main/java/com/osiris/jsqlgen/MainApplication.java

Author: Osiris-Team

README.md

@@ -128,6 +128,7 @@ even execute get/add/update/delete. Provided in the generated Database class.
 PRs for these issues are greatly appreciated (sorted from most important, to least important).
 - You need to know a bit of SQL, especially about definitions and defaults. This could be fixed by simplifying the GUI further.
 - Internally a `idCounter` is used for each table, meaning if rows are added by another program the counter won't be accurate anymore and thus further insert operations will fail.
+- Direct modifications of the database by a third-party program breaks stuff.
 - Java Code Generator: No support for `FOREIGN KEY` / references between tables. However note that the idea of references is supported (columns named tableNameId are refs).
 - Java Code Generator: No support for `VIEW, JOIN, UNION` / merged tables/results. This might never get fixed if its not possible to create a developer-friendly / simple API for this.
 - Since there is a global id counter for all tables and columns, in each application, collaboration and syncing changes might be difficult. 

core/src/main/java/com/osiris/jsqlgen/Main.java

@@ -7,6 +7,8 @@
 import com.osiris.jsqlgen.model.Column;
 import com.osiris.jsqlgen.model.Database;
 import com.osiris.jsqlgen.model.Table;
+import com.osiris.jsqlgen.model.TableChange;
+import com.osiris.jsqlgen.generator.GetTableChange;
 
 import java.io.File;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -29,6 +31,36 @@ public static void main(String[] args) {
                 }
             }
 
+            // If there are missing changes add them (which might happen when importing databases generated by older jSQL-Gen versions).
+            // For example if the table contains a column, but there is no change referencing that column
+            for (Table t : db.tables) {
+                if(t.changes.isEmpty()){
+                    TableChange currentTableChange = GetTableChange.get(t, Data.instance.databases);
+                    t.changes.add(currentTableChange);
+                }
+                for (Column col : t.columns) {
+                    boolean isAddedOnce = false;
+                    for (TableChange c : t.changes) {
+                        if(c.addedColumnNames.contains(col.name)) {
+                            isAddedOnce = true;
+                            break;
+                        }
+                    }
+                    boolean isRenamedOnce = false;
+                    for (TableChange c : t.changes) {
+                        if(c.newColumnNames.contains(col.name)) {
+                            isRenamedOnce = true;
+                            break;
+                        }
+                    }
+                    if(!isAddedOnce && !isRenamedOnce){
+                        TableChange firstChange = t.changes.get(0);
+                        firstChange.addedColumnNames.add(col.name);
+                        firstChange.addedColumnDefinitions.add(col.definition);
+                    }
+                }
+            }
+
             // Cache current data
             JavaCodeGenerator.oldDatabases.add(db.duplicate());
         }

core/src/main/java/com/osiris/jsqlgen/generator/GenCreateMethods.java

@@ -4,7 +4,7 @@
 import com.osiris.jsqlgen.model.Table;
 
 public class GenCreateMethods {
-    public static String s(Table t, String tNameQuoted, JavaCodeGenerator.Constructor minimalConstructor, boolean hasMoreFields) {
+    public static String s(Table t, String tNameQuoted, JavaCodeGenerator.Constructor constructor, JavaCodeGenerator.Constructor minimalConstructor, boolean hasMoreFields) {
         StringBuilder sb = new StringBuilder();
         sb.append("""
                 /**
@@ -14,16 +14,31 @@ Increments the id (thread-safe) and sets it for this object (basically reserves
                 Also note that this method will NOT add the object to the table.
                 */
                 """);
-        Column firstCol = t.columns.get(0);
-        String idParam = firstCol.type.inJava + " " + firstCol.name + ",";
+        Column idCol = t.columns.get(0); // always first
         sb.append(
-                "public static " + t.name + " create(" + minimalConstructor.params.replace(idParam, "")
+                "public static " + t.name + " create(" + minimalConstructor.paramsWithoutId
                         + ") {\n" +
-                        firstCol.type.inJava + " " + firstCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
+                        idCol.type.inJava + " " + idCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
                         "onCreate.forEach(code -> code.accept(obj));\n" +
                         "return obj;\n");
         sb.append("}\n\n"); // Close create method
 
+
+        if (hasMoreFields) {
+            sb.append("/**\n" +
+                    "Creates and returns an object that can be added to this table.\n" +
+                    "Increments the id (thread-safe) and sets it for this object (basically reserves a space in the database).\n" +
+                    "Note that this method will NOT add the object to the table.\n" +
+                    "*/\n");
+            sb.append(
+                    "public static " + t.name + " create(" + constructor.paramsWithoutId
+                            + ") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
+                            idCol.type.inJava + " " + idCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "();\n" + JavaCodeGenerator.genFieldAssignments("obj", t.columns) + "\n" +
+                            "onCreate.forEach(code -> code.accept(obj));\n" +
+                            "return obj;\n");
+            sb.append("}\n\n"); // Close create method
+        }
+
         sb.append("""
                 /**
                 Creates and returns an in-memory object with -1 as id, that can be added to this table
@@ -34,37 +49,41 @@ Increments the id (thread-safe) and sets it for this object (basically reserves
                 */
                 """);
         sb.append(
-                "public static " + t.name + " createInMem(" + minimalConstructor.params.replace(idParam, "")
+                "public static " + t.name + " createInMem(" + minimalConstructor.paramsWithoutId
                         + ") {\n" +
-                        firstCol.type.inJava + " " + firstCol.name + " = -1;\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
+                        idCol.type.inJava + " " + idCol.name + " = -1;\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
                         "onCreate.forEach(code -> code.accept(obj));\n" +
                         "return obj;\n");
         sb.append("}\n\n"); // Close create method
 
-
         if (hasMoreFields) {
-            sb.append("/**\n" +
-                    "Creates and returns an object that can be added to this table.\n" +
-                    "Increments the id (thread-safe) and sets it for this object (basically reserves a space in the database).\n" +
-                    "Note that this method will NOT add the object to the table.\n" +
-                    "*/\n");
+            sb.append("""
+                /**
+                Creates and returns an in-memory object with -1 as id, that can be added to this table
+                AFTER you manually did obj.id = idCounter.getAndIncrement().
+                This is useful for objects that may never be added to the table.
+                Note that the parameters of this method represent "NOT NULL" fields in the table and thus should not be null.
+                Also note that this method will NOT add the object to the table.
+                */
+                """);
             sb.append(
-                    "public static " + t.name + " create(" + JavaCodeGenerator.genParams(t.columns).replace(idParam, "")
+                    "public static " + t.name + " createInMem(" + constructor.paramsWithoutId
                             + ") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
-                            firstCol.type.inJava + " " + firstCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "();\n" + JavaCodeGenerator.genFieldAssignments("obj", t.columns) + "\n" +
+                            idCol.type.inJava + " " + idCol.name + " = -1;\n" + t.name + " obj = new " + t.name + "();\n" + JavaCodeGenerator.genFieldAssignments("obj", t.columns) + "\n" +
                             "onCreate.forEach(code -> code.accept(obj));\n" +
                             "return obj;\n");
             sb.append("}\n\n"); // Close create method
         }
 
+
         sb.append("/**\n" +
                 "Convenience method for creating and directly adding a new object to the table.\n" +
                 "Note that the parameters of this method represent \"NOT NULL\" fields in the table and thus should not be null.\n" +
                 "*/\n");
         sb.append(
-                "public static " + t.name + " createAndAdd(" + minimalConstructor.params.replace(idParam, "")
+                "public static " + t.name + " createAndAdd(" + minimalConstructor.paramsWithoutId
                         + ") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
-                        firstCol.type.inJava + " " + firstCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
+                        idCol.type.inJava + " " + idCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "(" + minimalConstructor.paramsWithoutTypes + ");\n" +
                         "onCreate.forEach(code -> code.accept(obj));\n" +
                         "add(obj);\n" +
                         "return obj;\n");
@@ -76,9 +95,9 @@ Increments the id (thread-safe) and sets it for this object (basically reserves
                     "Convenience method for creating and directly adding a new object to the table.\n" +
                     "*/\n");
             sb.append(
-                    "public static " + t.name + " createAndAdd(" + JavaCodeGenerator.genParams(t.columns).replace(idParam, "")
+                    "public static " + t.name + " createAndAdd(" + constructor.paramsWithoutId
                             + ") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
-                            firstCol.type.inJava + " " + firstCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "();\n" + JavaCodeGenerator.genFieldAssignments("obj", t.columns) + "\n" +
+                            idCol.type.inJava + " " + idCol.name + " = idCounter.getAndIncrement();\n" + t.name + " obj = new " + t.name + "();\n" + JavaCodeGenerator.genFieldAssignments("obj", t.columns) + "\n" +
                             "onCreate.forEach(code -> code.accept(obj));\n" +
                             "add(obj);\n" +
                             "return obj;\n");

core/src/main/java/com/osiris/jsqlgen/generator/GenDefBlobClass.java

@@ -10,7 +10,7 @@ public static String s(LinkedHashSet<String> imports) {
         imports.add("import java.sql.Blob;");
         imports.add("import java.sql.SQLException;");
 
-        return "class DefaultBlob implements Blob{\n" +
+        return "public static class DefaultBlob implements Blob{\n" +
                 "    private byte[] data;\n" +
                 "\n" +
                 "    // Constructor that accepts a byte array\n" +

core/src/main/java/com/osiris/jsqlgen/generator/GenRemoveMethods.java

@@ -37,6 +37,8 @@ public TreeNode(TreeNode parent) {
 
     public static String s(Database db, Table t, String tNameQuoted) {
 
+        Column idCol = t.columns.get(0);
+
         LinkedHashMap<Table, List<Column>> allRefs = getAllRefs(db, t);
         LinkedHashMap<Table, List<Column>> allDirectRefs = getAllDirectRefs(db, t);
 
@@ -49,14 +51,14 @@ public static String s(Database db, Table t, String tNameQuoted) {
         StringBuilder sb = new StringBuilder();
         sb.append(
                 "/**\n" +
-                        "Unsets its references (sets them to -1) and deletes the provided object from the database.\n" +
+                        "Unsets its references (sets them to -1/'') and deletes the provided object from the database.\n" +
                         "*/\n" +
                         "public static void remove(" + t.name + " obj) " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
                         "remove(obj, true, Database.isRemoveRefs);\n" +
                         "}\n" +
                 "/**\n" +
                         " * Deletes the provided object from the database.\n" +
-                        " * @param unsetRefs If true, sets ids in other tables to -1.\n" +
+                        " * @param unsetRefs If true, sets ids in other tables to -1/''.\n" +
                         " * @param removeRefs !!! EXTREME CAUTION REQUIRED, MAJOR DATA-LOSS POSSIBLE !!! If true removes the complete obj/row(s) in all tables that reference/contain this id.\n" +
                         " *                   This is recursive. It's highly recommended to call removeRefs() before instead, which allows to explicitly exclude some tables.\n" +
                         "*/\n" +
@@ -108,11 +110,16 @@ public static String s(Database db, Table t, String tNameQuoted) {
                 "     */\n" +
                 "public static void unsetRefs("+paramsDirect+") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n");
         allDirectRefs.forEach((t1, columns) -> {
-            for (Column col : columns) {
-                String param = getParamName(t1, col);
-                sb.append("if (remove_"+ param + ") {"+t1.name+".getLazySync(results -> { \n" +
-                        "  for("+t1.name+" obj1 : results) {obj1."+col.name+" = -1; obj1.update();};\n" +
-                        "}, totalCount -> {}, 100, "+t1.name+".where"+firstToUpperCase(col.name)+"().is(obj.id));}\n");
+            for (Column refCol : columns) {
+                String param = getParamName(t1, refCol);
+                String s = "if (remove_"+ param + ") {"+t1.name+".getLazySync(results -> { \n" +
+                        "  for("+t1.name+" refObj : results) {refObj."+refCol.name+" = " +
+                        (refCol.type.isText() ? "\"\"" : "-1") +
+                        "; refObj.update();};\n" +
+                        "}, totalCount -> {}, 100, "+t1.name+".where"+firstToUpperCase(refCol.name)+"().is(obj."+idCol.name+"));}";
+                if(!refCol.type.equals(idCol.type)) s = "/* Possibly not a primary id, since types do not match, thus ignored! " +
+                        t1.name+"."+refCol.name+" "+refCol.type.inJava +" != "+t.name+"."+idCol.name+" "+idCol.type.inJava+" \n" + s + "*/";
+                sb.append(s + "\n\n");
             }
         });
         sb.append("    }\n\n");
@@ -124,17 +131,20 @@ public static String s(Database db, Table t, String tNameQuoted) {
                 "public static void removeRefs("+params+") " + (t.isNoExceptions ? "" : "throws Exception") + " {\n" +
                 "// Take care of direct refs and indirect refs\n");
         allDirectRefs.forEach((t1, columns) -> {
-            for (Column col : columns) {
-                String param = getParamName(t1, col);
+            for (Column refCol : columns) {
+                String param = getParamName(t1, refCol);
                 LinkedHashMap<Table, List<Column>> allRefs1 = getAllRefs(db, t1);
                 String params1 = genRefParams(t1, allRefs1);
                 params1 = params1.substring(params1.indexOf("obj"))
-                        .replaceFirst("(obj)", "obj1")
+                        .replaceFirst("(obj)", "refObj")
                         .replaceAll("( boolean )", "");
                 //String paramsInvoke1 = genRefParamsInvoke(t1, allRefs1).replaceFirst("(obj)", "obj1");
-                sb.append("if (remove_"+ param + ") {"+t1.name+".getLazySync(results -> { \n" +
-                        "  for("+t1.name+" obj1 : results) {"+t1.name+".removeRefs("+params1.replaceAll("Class<[^>]+>", "")+");obj1.remove();};\n" +
-                        "}, totalCount -> {}, 100, "+t1.name+".where"+firstToUpperCase(col.name)+"().is(obj.id));}\n\n");
+                String s = "if (remove_"+ param + ") {"+t1.name+".getLazySync(results -> { \n" +
+                        "  for("+t1.name+" refObj : results) {"+t1.name+".removeRefs("+params1.replaceAll("Class<[^>]+>", "")+");refObj.remove();};\n" +
+                        "}, totalCount -> {}, 100, "+t1.name+".where"+firstToUpperCase(refCol.name)+"().is(obj."+idCol.name+"));}\n\n";
+                if(!refCol.type.equals(idCol.type)) s = "/* Possibly not a primary id, since types do not match, thus ignored! " +
+                        t1.name+"."+refCol.name+" "+refCol.type.inJava +" != "+t.name+"."+idCol.name+" "+idCol.type.inJava+" \n" + s + "*/";
+                sb.append(s + "\n\n");
                 //sb.append(t1.name+".remove(\"WHERE "+col.name+"=?\", obj.id);");
             }
         });