diff --git a/.github/workflows/onTagCreateRelease.yml b/.github/workflows/onTagCreateRelease.yml
new file mode 100644
index 0000000..50df544
--- /dev/null
+++ b/.github/workflows/onTagCreateRelease.yml
@@ -0,0 +1,79 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+    - "v*" # Push events to matching v*, i.e. v1.0, v20.15.10
+
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+
+      - name: Create release name using the tag name
+        run: |
+             githubRef=${{ github.ref }}
+             githubRef="${githubRef/'refs/tags'/''}"
+             githubRef="${githubRef/'/'/''}"
+             githubRef="${githubRef/'v'/''}"
+             echo "releaseLabel=$githubRef" >> $GITHUB_ENV
+
+
+      - name: Print release label
+        run: echo $releaseLabel
+
+
+      - name: Create release directory
+        run: mkdir -p release/bin
+
+
+    ### Generate jar file
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+
+      - name: Install Maven
+        run: sudo apt install maven
+
+
+      - name: Check Maven Version
+        run: mvn -version
+
+
+      - name: Build jar using Maven
+        run: mvn --batch-mode install verify -U -X
+
+
+    ### Create zip file
+
+      - name: Copy jar file from the dist to the release directory
+        run: cp dist/javaxt-orm*.jar release/bin/javaxt-orm.jar
+
+
+      - name: Copy release assets to the release directory
+        run: cp -r src LICENSE.TXT release
+
+
+      - name: Create zip file
+        run: cd release; zip -r ../javaxt-orm_v${{ env.releaseLabel }}.zip *
+
+
+    ### Upload zip file to javaxt.com
+
+      - name: Upload release to server
+        run: >-
+          curl -X POST -L
+          -H "Authorization: ${{ secrets.UPLOAD_AUTH }}"
+          -F "file=@javaxt-orm_v${{ env.releaseLabel }}.zip;type=application/zip"
+          "${{ secrets.UPLOAD_URL }}"
+
diff --git a/.gitignore b/.gitignore
index 5a73ffd..ef80201 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
-build/
-dist/
-nbproject/
-build.xml
-manifest.mf
\ No newline at end of file
+/build/
+/dist/
+/target/
+/nbproject/
+/build.xml
+/manifest.mf
+
diff --git a/LICENSE.TXT b/LICENSE.TXT
index 50147b1..f8d7956 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-Copyright (c) 2006-2023, Peter Borissow
+Copyright (c) 2006-2024, Peter Borissow
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/pom.xml b/pom.xml
index 352a3d5..7bbfb54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
       <dependency>
         <groupId>javaxt</groupId>
         <artifactId>javaxt-core</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.7</version>
       </dependency>
       <dependency>
         <groupId>org.openjdk.nashorn</groupId>
@@ -52,6 +52,20 @@
         <sourceDirectory>${src.dir}</sourceDirectory>
 
 
+        <!-- Tell maven to include non-java files in the jar file -->
+        <resources>
+          <resource>
+            <filtering>false</filtering>
+            <directory>src</directory>
+            <excludes>
+              <exclude>**/*.java</exclude>
+            </excludes>
+          </resource>
+        </resources>
+
+
+
+
         <plugins>
 
             <!-- Copy dependencies into the lib folder -->
diff --git a/src/javaxt/orm/Compiler.java b/src/javaxt/orm/Compiler.java
new file mode 100644
index 0000000..d38ec8b
--- /dev/null
+++ b/src/javaxt/orm/Compiler.java
@@ -0,0 +1,272 @@
+package javaxt.orm;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import javax.tools.*;
+import java.nio.charset.Charset;
+
+import static javaxt.utils.Console.console;
+
+//******************************************************************************
+//**  Compiler
+//******************************************************************************
+/**
+ *   Used to compile ORM models into Java classes. The classes are ephemeral
+ *   meaning they are not saved anywhere on disk (no class files or jar files).
+ *   Instead the classes are stored in memory and are tied to the lifecycle of
+ *   the JVM.
+ *
+ ******************************************************************************/
+
+public class Compiler {
+
+    private Class[] classes;
+    private HashMap<String, SimpleJavaFileObject> outputFiles;
+    private URLClassLoader urlClassLoader;
+    private DiagnosticListener<JavaFileObject> listener = null;
+    private Locale locale = null;
+    private Charset charset = Charset.defaultCharset();
+
+
+  //**************************************************************************
+  //** Constructor
+  //**************************************************************************
+    public Compiler(Model[] models) throws Exception {
+
+        if (models==null || models.length==0){
+            classes = new Class[0];
+        }
+        else{
+
+            outputFiles = new HashMap<>();
+            urlClassLoader = getClassLoader();
+
+
+
+          //Convert models into an ArrayList
+            ArrayList<Model> arr = new ArrayList<>();
+            for (Model model : models){
+                arr.add(model);
+            }
+
+
+          //Compile classes
+            ArrayList<Class> classes = new ArrayList<>();
+            int numErrors = 0;
+            while (classes.size()<models.length){
+                try{
+                    Model model = arr.get(0);
+                    classes.add(compile(model));
+                    arr.remove(0);
+                }
+                catch(Exception e){
+                    numErrors++;
+
+                  //The following logic assumes that the compile error is due
+                  //to an ordering issue where one class depends on another
+                  //but the dependency hasn't been compiled yet. So we'll
+                  //shuffle the list of models and try again.
+
+                    if (arr.size()==1) throw e;
+                    String firstClass = getClassName(arr.get(0));
+                    while (true){
+                        Collections.shuffle(arr);
+                        String className = getClassName(arr.get(0));
+                        if (!className.equals(firstClass)) break;
+                    }
+                }
+
+
+              //Safety switch
+                if (numErrors>(models.length*models.length)){
+                    throw new Exception("Failed to compile " + getClassName(arr.get(0)));
+                }
+            }
+
+
+          //Convert the class list into an array. Sorts the classes to match
+          //the order of the input models.
+            this.classes = new Class[classes.size()];
+            for (int i=0; i<models.length; i++){
+                String className = getClassName(models[i]);
+                for (Class c : classes){
+                    String name = c.getPackageName() + "." + c.getSimpleName();
+                    if (name.equals(className)){
+                        this.classes[i] = c;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+
+  //**************************************************************************
+  //** getClasses
+  //**************************************************************************
+  /** Returns classes generated by the compiler for each model
+   */
+    public Class[] getClasses(){
+        return classes;
+    }
+
+
+
+  //**************************************************************************
+  //** compile
+  //**************************************************************************
+  /** Used to compile a model and return a class
+   */
+    private Class compile(Model model) throws Exception {
+
+        JavaCompiler c = ToolProvider.getSystemJavaCompiler();
+        String className = getClassName(model);
+
+
+      //Create input file object
+        SimpleJavaFileObject src = new SimpleJavaFileObject(
+        URI.create("string:///" + model.getName() + ".java"),
+        JavaFileObject.Kind.SOURCE) {
+            public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+                return model.getJavaCode();
+            }
+        };
+
+
+
+      //Create output file object
+        SimpleJavaFileObject cls = new SimpleJavaFileObject(
+        URI.create("runtime:///" + model.getName() + ".class"),
+        JavaFileObject.Kind.CLASS) {
+            private ByteArrayOutputStream out = new ByteArrayOutputStream();
+            public OutputStream openOutputStream() throws IOException {
+                //console.log("openOutputStream");
+                return out;
+            }
+            public InputStream openInputStream() throws IOException {
+                //console.log("openInputStream");
+                return new ByteArrayInputStream(out.toByteArray());
+            }
+        };
+        outputFiles.put(className, cls);
+
+
+
+      //Create in-memory file manager
+        StandardJavaFileManager fm = c.getStandardFileManager(listener, locale, charset);
+        JavaFileManager fileManager = new ForwardingJavaFileManager(fm) {
+            public JavaFileObject getJavaFileForOutput(
+                JavaFileManager.Location location, String className,
+                JavaFileObject.Kind kind, FileObject sibling) throws IOException {
+                return outputFiles.get(className);
+            }
+
+
+            public Iterable list(JavaFileManager.Location location,
+                String packageName, Set kinds, boolean recurse) throws IOException {
+
+                if (location==StandardLocation.CLASS_PATH){
+                    ArrayList<SimpleJavaFileObject> arr = new ArrayList<>();
+                    Iterator<String> it = outputFiles.keySet().iterator();
+                    while (it.hasNext()){
+                        String name = it.next();
+                        if (name.startsWith(packageName + ".")){
+                            if (!name.equals(className)){ //don't include the current file since it hasn't been compiled yet
+                                arr.add(outputFiles.get(name));
+                            }
+                        }
+                    }
+                    if (!arr.isEmpty()) return arr;
+                }
+
+                return super.list(location, packageName, kinds, recurse);
+            }
+
+
+
+            public String inferBinaryName(JavaFileManager.Location location, JavaFileObject file) {
+
+                if (location==StandardLocation.CLASS_PATH){
+                    Iterator<String> it = outputFiles.keySet().iterator();
+                    while (it.hasNext()){
+                        String name = it.next();
+                        SimpleJavaFileObject f = outputFiles.get(name);
+                        if (file==f) return name;
+                    }
+                }
+
+                return super.inferBinaryName(location, file);
+            }
+        };
+
+
+
+
+      //Compile class
+        JavaCompiler.CompilationTask task = c.getTask(
+            null,
+            fileManager,
+            listener,
+            Collections.emptySet(),
+            Collections.emptySet(),
+            Collections.singleton(src)
+        );
+
+        if (task.call()) {
+            return urlClassLoader.loadClass(className);
+        }
+        else{
+            throw new Exception("Failed to compile " + className);
+        }
+    }
+
+
+  //**************************************************************************
+  //** getClassLoader
+  //**************************************************************************
+  /** Returns a custom class loader used to find classes created by this class
+   */
+    private URLClassLoader getClassLoader(){
+        return new URLClassLoader(new URL[0]){
+            protected Class<?> findClass(final String name) throws ClassNotFoundException {
+
+
+                SimpleJavaFileObject f = outputFiles.get(name);
+                if (f!=null){
+                    try (InputStream is = f.openInputStream()) {
+
+
+                        ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+                        int x;
+                        byte[] buffer = new byte[256];
+                        while ((x = is.read(buffer, 0, buffer.length)) != -1) {
+                            out.write(buffer, 0, x);
+                        }
+
+                        out.flush();
+                        byte[] classBytes = out.toByteArray();
+                        return defineClass(name, classBytes, 0, classBytes.length);
+
+                    }
+                    catch(Exception e){
+                        e.printStackTrace();
+                    }
+                }
+
+                return super.findClass(name);
+            }
+        };
+    }
+
+
+  //**************************************************************************
+  //** getClassName
+  //**************************************************************************
+    private String getClassName(Model model){
+        return model.getPackageName() + "." + model.getName();
+    }
+
+
+}
\ No newline at end of file
diff --git a/src/javaxt/orm/Field.java b/src/javaxt/orm/Field.java
index d73f21b..1f607a5 100644
--- a/src/javaxt/orm/Field.java
+++ b/src/javaxt/orm/Field.java
@@ -18,6 +18,7 @@ public class Field {
     private boolean unique = false;
     private Object defaultValue = null;
     private Integer length;
+    private boolean isModel = false;
     private ForeignKey foreignKey;
 
 
@@ -26,12 +27,18 @@ public class Field {
   //**************************************************************************
   /** Creates a new instance of this class.
    */
-    protected Field(String name, String type){
+    protected Field(String name, String type, Model model){
         this.name = name;
         this.columnName = Utils.camelCaseToUnderScore(name);
 
-        if (type.equalsIgnoreCase("int")){
-            type = "integer";
+      //Set columnType and tweak type as needed
+        if (type.equalsIgnoreCase("int") || type.equalsIgnoreCase("integer")){
+            type = "Integer";
+            columnType = "integer";
+        }
+        else if (type.equalsIgnoreCase("int[]")){
+            type = "Integer[]";
+            columnType = "integer array";
         }
         else if (type.equalsIgnoreCase("long")){
             columnType = "bigint";
@@ -44,9 +51,13 @@ else if (type.equalsIgnoreCase("decimal") || type.equalsIgnoreCase("numeric")){
             type = "BigDecimal";
             columnType = "numeric";
         }
-        else if (type.equalsIgnoreCase("text") || type.equalsIgnoreCase("string")){
-            type = "string";
-            columnType = "text";
+        else if (type.equalsIgnoreCase("text") || type.equalsIgnoreCase("string") || type.equalsIgnoreCase("password")){
+            type = "String";
+            columnType = "varchar"; //varchar without the length specifier and text are equivalent
+        }
+        else if (type.equalsIgnoreCase("text[]") || type.equalsIgnoreCase("string[]")){
+            type = "String[]";
+            columnType = "varchar array"; //same as "text array"
         }
         else if (type.equalsIgnoreCase("char")){
             type = "string";
@@ -74,24 +85,30 @@ else if (type.equalsIgnoreCase("geometry")){
             type = "Geometry";
             columnType = "geometry(GeometryZ)";
         }
-        else if (type.equalsIgnoreCase("password")){
-            //type = "String";
-            columnType = "text";
-        }
         else{ //Model?
 
 
             if (type.endsWith("[]")){ //Array of models
 
                 String modelName = type.substring(0, type.length()-2);
-                type = "ArrayList<" + modelName + ">";
+                type = "ArrayList<" + Utils.capitalize(modelName) + ">";
 
             }
             else{ //Single model
 
+                isModel = true;
                 columnName = columnName + "_id";
-                foreignKey = new ForeignKey(columnName, type);
                 columnType = "bigint";
+
+              //Typically, when we have a model field we want to create a
+              //foreign key to tie the field to the model. The only exception
+              //is if the model field references the parent model - which is
+              //very rare (most models don't have a model field with the same
+              //type).
+                if (!type.equals(model.getName())){
+                    foreignKey = new ForeignKey(columnName, type);
+                }
+
             }
 
         }
@@ -127,7 +144,7 @@ public boolean isLastModifiedDate(){
     }
 
     public boolean isModel(){
-        return foreignKey!=null;
+        return isModel;
     }
 
     public boolean isArray(){
@@ -178,7 +195,8 @@ public void setDefaultValue(Object defaultValue){
 
 
     public void setLength(int length){
-        if (columnType.equalsIgnoreCase("text")){
+        if (columnType.equalsIgnoreCase("text") ||
+            columnType.equalsIgnoreCase("varchar")){
             columnType = "VARCHAR(" + length + ")";
             this.length = length;
         }
diff --git a/src/javaxt/orm/Main.java b/src/javaxt/orm/Main.java
index 4c905c0..73739e1 100644
--- a/src/javaxt/orm/Main.java
+++ b/src/javaxt/orm/Main.java
@@ -1,59 +1,73 @@
-package javaxt.orm;
-import java.util.*;
-import javaxt.io.Jar;
-import static javaxt.utils.Console.console;
-
-//******************************************************************************
-//**  Main
-//******************************************************************************
-/**
- *  Command line interface used to parse a model file and generate Java and SQL
- *  output files.
- *
- ******************************************************************************/
-
-public class Main {
-
-
-  //**************************************************************************
-  //** main
-  //**************************************************************************
-  /** Entry point for the application
-   *  @param arguments Command line arguments
-   */
-    public static void main(String[] arguments) throws Exception {
-        HashMap<String, String> args = console.parseArgs(arguments);
-
-
-      //Print version as needed
-        if (args.containsKey("-version")){
-            Jar jar = new Jar(Main.class);
-            javaxt.io.File jarFile = new javaxt.io.File(jar.getFile());
-            String version = jar.getVersion();
-            if (version==null) version = "Unknown";
-            System.out.println(jarFile.getName(false) + " version \"" + version + "\"");
-            return;
-        }
-
-
-      //Parse inputs
-        String input = args.get("-input");
-        String output = args.get("-output");
-        if (input==null){
-            input = arguments[0];
-            if (arguments.length>1) output = arguments[1];
-        }
-        javaxt.io.File inputFile = new javaxt.io.File(input);
-        if (!inputFile.exists()) throw new IllegalArgumentException("Input file not found");
-        javaxt.io.Directory outputDirectory = output==null ?
-                inputFile.getDirectory() : new javaxt.io.Directory(output);
-
-
-      //Create models
-        Model[] models = new Parser(inputFile.getText()).getModels();
-
-
-      //Create files
-        Writer.write(models, outputDirectory);
-    }
+package javaxt.orm;
+import java.util.*;
+import javaxt.io.Jar;
+import static javaxt.utils.Console.console;
+
+//******************************************************************************
+//**  Main
+//******************************************************************************
+/**
+ *  Command line interface used to parse a model file and generate Java and SQL
+ *  output files.
+ *
+ ******************************************************************************/
+
+public class Main {
+
+
+  //**************************************************************************
+  //** main
+  //**************************************************************************
+  /** Entry point for the application
+   *  @param arguments Command line arguments
+   */
+    public static void main(String[] arguments) throws Exception {
+        HashMap<String, String> args = console.parseArgs(arguments);
+
+
+      //Print version as needed
+        if (args.containsKey("-version")){
+            Jar jar = new Jar(Main.class);
+            javaxt.io.File jarFile = new javaxt.io.File(jar.getFile());
+            String version = jar.getVersion();
+            if (version==null) version = "Unknown";
+            System.out.println(jarFile.getName(false) + " version \"" + version + "\"");
+            return;
+        }
+
+
+      //Parse inputs
+        String input = args.get("-input");
+        String output = args.get("-output");
+        if (input==null){
+            if (arguments.length>0) input = arguments[0];
+            if (arguments.length>1) output = arguments[1];
+        }
+
+
+      //Get input file
+        javaxt.io.File inputFile;
+        try{
+            if (input==null) throw new IllegalArgumentException("Input file is required");
+            inputFile = new javaxt.io.File(input);
+            if (!inputFile.exists()) throw new IllegalArgumentException("Input file not found");
+        }
+        catch(Exception e){
+            System.out.println(e.getMessage());
+            return;
+        }
+
+
+      //Get output directory
+        javaxt.io.Directory outputDirectory = output==null ?
+                inputFile.getDirectory() : new javaxt.io.Directory(output);
+
+
+      //Create models
+        Model[] models = new Parser(inputFile.getText()).getModels();
+
+
+      //Create files
+        Writer.write(models, outputDirectory);
+    }
 }
\ No newline at end of file
diff --git a/src/javaxt/orm/Model.java b/src/javaxt/orm/Model.java
index fee6fd8..7b4de08 100644
--- a/src/javaxt/orm/Model.java
+++ b/src/javaxt/orm/Model.java
@@ -16,6 +16,7 @@ public class Model {
     private String name;
     private TreeSet<String> implementations;
     private ArrayList<Field> fields;
+    private ArrayList<JSONObject> indexes;
     private static final String template = getTemplate();
     private String tableName;
     private String escapedTableName;
@@ -34,6 +35,7 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
         this.name = modelName;
         this.implementations = new TreeSet<>();
         this.fields = new ArrayList<>();
+        this.indexes = new ArrayList<>();
         this.options = options;
         this.packageName = packageName;
         this.tableName = Utils.camelCaseToUnderScore(name).toLowerCase();
@@ -61,17 +63,21 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
 
       //Parse fields
         JSONArray arr = modelInfo.get("fields").toJSONArray();
-        if (arr!=null)
-        for (int i=0; i<arr.length(); i++){
-            JSONObject json = arr.get(i).toJSONObject();
-            Field field = new Field(json.get("name").toString(), json.get("type").toString());
-
-
-          //Don't add ID field. It is added automatically.
-            if (field.getName().equalsIgnoreCase("id")) continue;
-
-
-            fields.add(field);
+        if (arr!=null){
+            for (JSONValue f : arr){
+                String name = f.get("name").toString();
+                String type = f.get("type").toString();
+
+              //Don't add ID field. It is added automatically.
+                if (name.equalsIgnoreCase("id")) continue;
+
+              //Create field and update the fields array
+                Field field = new Field(name, type, this);
+                addConstraints(field, f.toJSONObject());
+                Object defaultValue = f.get("default").toObject();
+                field.setDefaultValue(defaultValue);
+                this.fields.add(field);
+            }
         }
 
 
@@ -80,63 +86,119 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
         if (hasMany!=null)
         for (int i=0; i<hasMany.length(); i++){
             JSONObject json = hasMany.get(i).toJSONObject();
-            Field field = new Field(json.get("name").toString(), json.get("model").toString()+"[]");
+            Field field = new Field(json.get("name").toString(), json.get("model").toString()+"[]", this);
             fields.add(field);
         }
 
 
-
       //Parse constraints
         JSONArray constraints = modelInfo.get("constraints").toJSONArray();
-        if (constraints!=null)
-        for (int i=0; i<constraints.length(); i++){
-            JSONObject constraint = constraints.get(i).toJSONObject();
-            String fieldName = constraint.get("name").toString();
-            Boolean isRequired = constraint.get("required").toBoolean();
-            if (isRequired==null) isRequired = constraint.get("nullable").toBoolean();
-            Boolean isUnique = constraint.get("unique").toBoolean();
-            Integer length = constraint.get("length").toInteger();
-            if (length==null) length = constraint.get("size").toInteger();
-            Integer srid = constraint.get("srid").toInteger();
+        if (constraints!=null){
+            for (JSONValue constraint : constraints){
+                String fieldName = constraint.get("field").toString();
+                if (fieldName==null) fieldName = constraint.get("name").toString();
+
+                for (Field field : fields){
+                    if (field.getName().equals(fieldName)){
+                        addConstraints(field, constraint.toJSONObject());
+                        break;
+                    }
+                }
+            }
+        }
 
-            for (Field field : fields){
-                if (field.getName().equals(fieldName)){
-                    if (isRequired!=null) field.isRequired(isRequired);
-                    if (isUnique!=null) field.isUnique(isUnique);
-                    if (length!=null) field.setLength(length);
-                    if (srid!=null) field.setSRID(srid);
-
-                    ForeignKey foreignKey = field.getForeignKey();
-                    if (foreignKey!=null){
-                        if (constraint.has("onDelete")){
-                            foreignKey.onDelete(constraint.get("onDelete").toString());
+
+      //Parse indexes
+        JSONArray indexes = modelInfo.get("indexes").toJSONArray();
+        if (indexes==null) indexes = modelInfo.get("indices").toJSONArray();
+        if (indexes!=null){
+            for (JSONValue index : indexes){
+
+                JSONObject idx;
+                if (index.toObject() instanceof String){
+                    String fieldName = index.toString();
+                    idx = new JSONObject();
+                    idx.set("field", fieldName);
+                }
+                else{
+                    idx = index.toJSONObject();
+                    if (idx!=null){
+                        if (idx.has("fields")){
+                            idx.set("field", idx.remove("fields"));
                         }
                     }
-
-                    break;
                 }
+
+                if (idx!=null) this.indexes.add(idx);
             }
         }
 
 
       //Parse default values
         JSONArray defaultValues = modelInfo.get("defaults").toJSONArray();
-        if (defaultValues!=null)
-        for (int i=0; i<defaultValues.length(); i++){
-            JSONObject json = defaultValues.get(i).toJSONObject();
-            String fieldName = json.get("name").toString();
-            Object val = json.get("value").toObject();
-
-            for (Field field : fields){
-                if (field.getName().equals(fieldName)){
-                    field.setDefaultValue(val);
-                    break;
+        if (defaultValues!=null){
+            for (JSONValue d : defaultValues){
+                String fieldName = d.get("field").toString();
+                if (fieldName==null) fieldName = d.get("name").toString();
+
+                for (Field field : fields){
+                    if (field.getName().equals(fieldName)){
+                        field.setDefaultValue(d.get("value").toObject());
+                        break;
+                    }
                 }
             }
         }
     }
 
 
+  //**************************************************************************
+  //** addConstraints
+  //**************************************************************************
+  /** Used to add constraints to a given field. Constraints can be defined in
+   *  a "constraints" array or inline with the field definition. If both are
+   *  present, the constraints in the "constraints" array may override
+   *  constraints defined inline.
+   */
+    private void addConstraints(Field field, JSONObject constraint){
+
+        Boolean isRequired = constraint.get("required").toBoolean();
+        if (isRequired==null) isRequired = constraint.get("nullable").toBoolean();
+        Boolean isUnique = constraint.get("unique").toBoolean();
+        Integer length = constraint.get("length").toInteger();
+        if (length==null) length = constraint.get("size").toInteger();
+        Integer srid = constraint.get("srid").toInteger();
+
+
+        if (isRequired!=null) field.isRequired(isRequired);
+        if (isUnique!=null) field.isUnique(isUnique);
+        if (length!=null) field.setLength(length);
+        if (srid!=null) field.setSRID(srid);
+
+
+        ForeignKey foreignKey = field.getForeignKey();
+        if (foreignKey!=null){
+            String onDelete = constraint.get("onDelete").toString();
+
+          //Special case for models. Cascade delete by default
+            if (onDelete==null && field.isModel()){
+                onDelete = "cascade";
+            }
+
+            if (onDelete!=null){
+                foreignKey.onDelete(onDelete);
+            }
+        }
+
+
+        if (constraint.has("default")){
+            Object defaultValue = constraint.get("default").toObject();
+            field.setDefaultValue(defaultValue);
+        }
+
+    }
+
+
   //**************************************************************************
   //** getName
   //**************************************************************************
@@ -210,9 +272,34 @@ public String getJavaCode(){
         TreeSet<String> includes = new TreeSet<>();
 
 
+
+      //Special case for models that implement java.security.Principal
+        boolean hasNameField = false;
+        String getSecurityPrincipalName = "";
+        if (implementations.contains("java.security.Principal")){
+
+          //Check if fields have a name field
+            for (Field field : fields){
+                if (field.getName().equalsIgnoreCase("name")){
+                    hasNameField = true;
+                    break;
+                }
+            }
+
+          //If no name field is found, we'll need to add a public getName()
+            if (!hasNameField){
+                getSecurityPrincipalName += "    public String getName(){\r\n";
+                getSecurityPrincipalName += "        return null;\r\n";
+                getSecurityPrincipalName += "    }\r\n\r\n";
+            }
+        }
+
+
+
+      //Loop through all the fields and generate java code
         for (int i=0; i<fields.size(); i++){
             Field field = fields.get(i);
-            String fieldName = field.getName();
+            String fieldName = Utils.underscoreToCamelCase(field.getName());
             String fieldType = field.getType();
             String methodName = Utils.capitalize(fieldName);
             String columnName = field.getColumnName();
@@ -227,7 +314,7 @@ public String getJavaCode(){
             if (fieldType.equals("BigDecimal")) includes.add("java.math.BigDecimal");
             if (fieldType.equals("Geometry")){
                 String jts = options.get("jts");
-                if (jts==null) jts = "com.vividsolutions.jts";
+                if (jts==null) jts = "org.locationtech.jts"; //vs "com.vividsolutions.jts";
                 includes.add(jts+".geom.Geometry");
                 includes.add(jts+".io.WKTReader");
             }
@@ -308,25 +395,14 @@ public String getJavaCode(){
                     publicMembers.append("    }\r\n\r\n");
                 }
 
-              //Add extra method if username and implements java.security.Principal
-                if (fieldName.equals("username") && fieldType.equals("String") &&
-                    implementations.contains("java.security.Principal")){
-
-                    boolean addMethod = true;
-                    for (Field f : fields){
-                        if (f.getName().equals("name")){
-                            addMethod = false;
-                            break;
-                        }
-                    }
 
-                    if (addMethod){
-                        publicMembers.append("    public String getName(){\r\n");
-                        publicMembers.append("        return ");
-                        publicMembers.append(fieldName);
-                        publicMembers.append(";\r\n");
-                        publicMembers.append("    }\r\n\r\n");
-                    }
+              //Special case for models that implement java.security.Principal
+              //If there's no name field, use the username as a return value
+              //for the getName() method
+                if (fieldName.equals("username") && fieldType.equals("String") &&
+                    implementations.contains("java.security.Principal") &&
+                    !hasNameField){
+                    getSecurityPrincipalName = getSecurityPrincipalName.replace("null", fieldName);
                 }
 
             }
@@ -436,13 +512,33 @@ else if (fieldType.equals("Geometry")){
                         getValues.append("\").toString());}catch(Exception e){}\r\n");
                     }
                     else{
-                        getValues.append("            this.");
-                        getValues.append(fieldName);
-                        getValues.append(" = getValue(rs, \"");
-                        getValues.append(columnName);
-                        getValues.append("\").to");
-                        getValues.append(password ? "String" : fieldType);
-                        getValues.append("();\r\n");
+
+                        if (fieldType.endsWith("[]")){ //e.g. String[]
+                            getValues.append("            {");
+
+                            //Object[] v = (Object[])getValue(rs, "recent_customers").toArray();
+                            getValues.append("Object[] v = (Object[]) getValue(rs, \"");
+                            getValues.append(columnName);
+                            getValues.append("\").toArray();\r\n");
+
+                            //this.recentCustomers = java.util.Arrays.copyOf(v, v.length, String[].class);
+                            getValues.append("            this.");
+                            getValues.append(fieldName);
+                            getValues.append(" = v==null ? null : java.util.Arrays.copyOf(v, v.length, ");
+                            getValues.append(fieldType);
+                            getValues.append(".class);");
+
+                            getValues.append("}\r\n");
+                        }
+                        else{
+                            getValues.append("            this.");
+                            getValues.append(fieldName);
+                            getValues.append(" = getValue(rs, \"");
+                            getValues.append(columnName);
+                            getValues.append("\").to");
+                            getValues.append(password ? "String" : fieldType);
+                            getValues.append("();\r\n");
+                        }
                     }
                 }
                 else{
@@ -541,13 +637,35 @@ else if (fieldType.equals("byte[]")){
                             getJson.append("\").toByteArray();\r\n");
                         }
                         else{
-                            getJson.append("        this.");
-                            getJson.append(fieldName);
-                            getJson.append(" = json.get(\"");
-                            getJson.append(fieldName);
-                            getJson.append("\").to");
-                            getJson.append(fieldType);
-                            getJson.append("();\r\n");
+
+                            if (fieldType.endsWith("[]")){ //e.g. String[]
+                                getJson.append("        {");
+
+                                //Object[] v = json.has("recentCustomers") ? json.get("recentCustomers").toJSONArray().toArray() : null;
+                                getJson.append("Object[] v = json.has(\"");
+                                getJson.append(fieldName);
+                                getJson.append("\") ? json.get(\"");
+                                getJson.append(fieldName);
+                                getJson.append("\").toJSONArray().toArray() : null;\r\n");
+
+                                //this.recentCustomers = java.util.Arrays.copyOf(v, v.length, String[].class);
+                                getJson.append("        this.");
+                                getJson.append(fieldName);
+                                getJson.append(" = v==null ? null : java.util.Arrays.copyOf(v, v.length, ");
+                                getJson.append(fieldType);
+                                getJson.append(".class);");
+
+                                getJson.append("}\r\n");
+                            }
+                            else{
+                                getJson.append("        this.");
+                                getJson.append(fieldName);
+                                getJson.append(" = json.get(\"");
+                                getJson.append(fieldName);
+                                getJson.append("\").to");
+                                getJson.append(fieldType);
+                                getJson.append("();\r\n");
+                            }
                         }
                     }
                     else{
@@ -659,7 +777,7 @@ else if (fieldType.equals("byte[]")){
         str = str.replace("${field[0]}", fields.get(0).getColumnName());
         str = str.replace("${initArrays}", initArrays.toString().trim());
         str = str.replace("${privateFields}", privateFields.toString().trim());
-        str = str.replace("${publicMembers}", publicMembers.toString().trim());
+        str = str.replace("${publicMembers}", (getSecurityPrincipalName + publicMembers.toString()).trim());
         str = str.replace("${getModels}", getModels.toString());
         str = str.replace("${getValues}", getValues.toString());
         str = str.replace("${getJson}", getJson.toString().trim());
@@ -966,14 +1084,30 @@ public String getForeignKeySQL(){
     public String getIndexSQL(){
         StringBuilder str = new StringBuilder();
         String indexPrefix = "IDX_" + tableName.toUpperCase()+ "_";
-        Iterator<Field> it = fields.iterator();
-        while (it.hasNext()){
-            Field field = it.next();
+        HashMap<String, String> columnNames = new HashMap<>();
+
+      //Create a hashmap of indexes using field names as keys
+        HashMap<String, JSONObject> indexes = new HashMap<>();
+        for (JSONObject index : this.indexes){
+            String fieldName = index.get("field").toString();
+            indexes.put(fieldName, index);
+        }
+
+
+      //Add indexes to foreign key and geo fields
+        for (Field field : fields){
+
             if (!field.isArray()){
+
                 ForeignKey foreignKey = field.getForeignKey();
                 if (foreignKey!=null){
+
                     String columnName = foreignKey.getColumnName().toUpperCase();
                     String foreignTable = foreignKey.getForeignTable().toUpperCase();
+                    columnNames.put(field.getName(), columnName);
+
+
+                  //Automatically index foreign key fields
                     str.append("CREATE INDEX ");
                     str.append(indexPrefix);
                     str.append(foreignTable);
@@ -982,9 +1116,15 @@ public String getIndexSQL(){
                     str.append("(");
                     str.append(columnName);
                     str.append(");\r\n");
+
+                    indexes.remove(field.getName());
                 }
                 else{
+
                     String columnName = field.getColumnName().toUpperCase();
+                    columnNames.put(field.getName(), columnName);
+
+                  //Automatically index geospatial fields
                     if (field.getColumnType().startsWith("geo")){
                         str.append("CREATE INDEX ");
                         str.append(indexPrefix);
@@ -994,6 +1134,8 @@ public String getIndexSQL(){
                         str.append(" USING GIST(");
                         str.append(columnName);
                         str.append(");\r\n");
+
+                        indexes.remove(field.getName());
                     }
                 }
             }
@@ -1001,6 +1143,66 @@ public String getIndexSQL(){
                 //Handled by getDiamondTableSQL()
             }
         }
+
+
+
+      //Add user defined indexes
+        for (String key : indexes.keySet()){
+            JSONObject index = indexes.get(key);
+            String name = index.get("name").toString();
+            String type = index.get("type").toString();
+
+
+            ArrayList<String> columns = new ArrayList<>();
+            if (index.get("field").toObject() instanceof String){
+                String fieldName = index.get("field").toString();
+                String columnName = columnNames.get(fieldName);
+                if (columnName!=null){
+                    columns.add(columnName);
+                }
+            }
+            else{
+                JSONArray arr = index.get("field").toJSONArray();
+                if (arr!=null){
+                    for (JSONValue v : arr){
+                        String fieldName = v.toString();
+                        String columnName = columnNames.get(fieldName);
+                        if (columnName!=null){
+                            columns.add(columnName);
+                        }
+                    }
+                }
+            }
+            if (columns.isEmpty()) continue;
+
+
+
+
+
+            str.append("CREATE ");
+            if (type!=null) str.append(type + " ");
+            str.append("INDEX ");
+            if (name==null){
+                str.append(indexPrefix);
+                for (int i=0; i<columns.size(); i++){
+                    if (i>0) str.append("_");
+                    str.append(columns.get(i));
+                }
+            }
+            else{
+                str.append(name.toUpperCase());
+            }
+
+            str.append(" ON ");
+            str.append(escapedTableName);
+            str.append("(");
+            for (int i=0; i<columns.size(); i++){
+                if (i>0) str.append(", ");
+                str.append(columns.get(i));
+            }
+            str.append(");\r\n");
+        }
+
         return str.toString();
     }
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/javaxt-project/javaxt-orm/compare/feat/1...master.diff" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/javaxt-project/javaxt-orm/compare/feat/1...master.diff" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/javaxt-project/javaxt-orm/compare/feat/1...master.diff" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/javaxt-project/javaxt-orm/compare/feat/1...master.diff" target="_blank">pFad v4 Proxy</a></p></body>
</html>