- Added support for "geometry" types (vs "geo")

 - Added ability to specify SRID for both geometry and geo types
 - Added option to specify JTS version (e.g. "com.vividsolutions.jts" vs "org.locationtech.jts")
 - Added try/catch block around the WKT Parser
 - Updated default name of diamond tables

git-svn-id: svn://192.168.0.80/JavaXT/javaxt-orm@1329 2c7b0aa6-e0b2-3c4e-bb4a-8b65b6c465ff

Author: pborissow

src/javaxt/orm/Field.java

@@ -68,7 +68,11 @@ else if (type.equalsIgnoreCase("json")){
         }
         else if (type.equalsIgnoreCase("geo")){
             type = "Geometry";
-            columnType = "geometry(Geometry,4326)"; //PostgreSQL specific
+            columnType = "geometry(Geometry,4326)";
+        }
+        else if (type.equalsIgnoreCase("geometry")){
+            type = "Geometry";
+            columnType = "geometry(GeometryZ)";
         }
         else if (type.equalsIgnoreCase("password")){
             //type = "String";
@@ -185,4 +189,15 @@ public void setLength(int length){
             }
         }
     }
+
+
+    public void setSRID(Integer srid){
+        if (type.equalsIgnoreCase("Geometry")){
+            boolean hasZ = columnType.contains("Z");
+            columnType = "geometry(Geometry";
+            if (hasZ) columnType+="Z";
+            if (srid!=null) columnType+=","+srid;
+            columnType+=")";
+        }
+    }
 }

src/javaxt/orm/Model.java

@@ -1,5 +1,6 @@
 package javaxt.orm;
 import javaxt.json.*;
+import java.util.HashMap;
 
 //******************************************************************************
 //**  Model Class
@@ -19,20 +20,21 @@ public class Model {
     private String packageName;
     private String schemaName;
     private String escapedSchemaName;
+    private HashMap<String, String> options;
 
 
   //**************************************************************************
   //** Constructor
   //**************************************************************************
   /** Creates a new instance of this class.
    */
-    protected Model(String modelName, String packageName, String schemaName, JSONObject modelInfo){
+    protected Model(String modelName, JSONObject modelInfo, String packageName, HashMap<String, String> options){
         this.name = modelName;
         this.fields = new java.util.ArrayList<Field>();
-
+        this.options = options;
         this.packageName = packageName;
         this.tableName = Utils.camelCaseToUnderScore(name).toLowerCase();
-        this.schemaName = schemaName;
+        this.schemaName = options.get("schema");
 
 
         if (schemaName==null){
@@ -83,13 +85,14 @@ protected Model(String modelName, String packageName, String schemaName, JSONObj
             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();
 
             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){
@@ -207,8 +210,10 @@ public String getJavaCode(){
             if (fieldType.equals("Date")) includes.add("javaxt.utils.Date");
             if (fieldType.equals("BigDecimal")) includes.add("java.math.BigDecimal");
             if (fieldType.equals("Geometry")){
-                includes.add("com.vividsolutions.jts.geom.Geometry");
-                includes.add("com.vividsolutions.jts.io.WKTReader");
+                String jts = options.get("jts");
+                if (jts==null) jts = "com.vividsolutions.jts";
+                includes.add(jts+".geom.Geometry");
+                includes.add(jts+".io.WKTReader");
             }
 
 
@@ -348,11 +353,11 @@ else if (fieldType.equals("byte[]")){
                         getValues.append("\").toByteArray();\r\n");
                     }
                     else if (fieldType.equals("Geometry")){
-                        getValues.append("            this.");
+                        getValues.append("            try{this.");
                         getValues.append(fieldName);
                         getValues.append(" = new WKTReader().read(getValue(rs, \"");
                         getValues.append(columnName);
-                        getValues.append("\").toString());\r\n");
+                        getValues.append("\").toString());}catch(Exception e){}\r\n");
                     }
                     else{
                         getValues.append("            this.");
@@ -773,8 +778,8 @@ public String getDiamondTableSQL(){
                 if (leftTable.equals(rightTable)) rightColumn = rightTable + "_ID2";
 
 
-                //String tableName = leftTable + "_" + rightTable;
-                String tableName = leftTable + "_" + field.getColumnName().toUpperCase();
+                String tableName = leftTable + "_" + rightTable;
+                //String tableName = leftTable + "_" + field.getColumnName().toUpperCase();
 
 
                 String foreignKey = "FK_" + tableName;

src/javaxt/orm/Parser.java

@@ -2,6 +2,7 @@
 import javax.script.*;
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
 import javaxt.json.*;
+import java.util.HashMap;
 
 //******************************************************************************
 //**  Parser Class
@@ -13,9 +14,8 @@
 
 public class Parser {
 
-    private String packageName;
-    private String schemaName;
     private Model[] models;
+    private static String[] optionalVars = new String[]{"schema", "jts"};
 
 
   //**************************************************************************
@@ -65,13 +65,17 @@ public Model[] getModels(){
   /** Used to parse a json document containing models and a package name.
    */
     private void init(JSONObject json){
-        packageName = json.get("package").toString();
-        schemaName = json.get("schema").toString();
+        String packageName = json.get("package").toString();
         JSONObject models = json.get("models").toJSONObject();
+        HashMap<String, String> options = new HashMap<String, String>();
+        for (String key : optionalVars){
+            String val = json.get(key).toString();
+            if (val!=null) options.put(key, val);
+        }
 
         java.util.ArrayList<Model> arr = new java.util.ArrayList<Model>();
         for (String modelName : models.keySet()){
-            Model model = new Model(modelName, packageName, schemaName, models.get(modelName).toJSONObject());
+            Model model = new Model(modelName, models.get(modelName).toJSONObject(), packageName, options);
             arr.add(model);
         }
 
@@ -98,25 +102,28 @@ private JSONObject parseJavaScript(String js) throws Exception {
         ScriptContext ctx = new SimpleScriptContext();
         ctx.setBindings(engine.createBindings(), ScriptContext.ENGINE_SCOPE);
         engine.eval(js, ctx);
-        Object packageName = ctx.getAttribute("package");
-        Object schemaName = ctx.getAttribute("schema");
-        Object models = ctx.getAttribute("models");
 
 
-      //Add package to output
+      //Add package name to output
+        Object packageName = ctx.getAttribute("package");
         output.set("package", packageName.toString());
 
 
-      //Add package to output
-        if (schemaName!=null) output.set("schema", schemaName.toString());
-        
+      //Add options to output
+        for (String key : optionalVars){
+            Object schemaName = ctx.getAttribute(key);
+            if (schemaName!=null) output.set(key, schemaName.toString());
+        }
+
 
       //Stringify models and convert to json
+        Object models = ctx.getAttribute("models");
         ScriptObjectMirror json = (ScriptObjectMirror) engine.eval("JSON");
         String str = json.callMember("stringify", models).toString();
         output.set("models", new JSONObject(str));
 
 
+
       //Return JSON
         return output;
     }