Fixed bug creating foreign keys for model fields with the same type as the parent model

Author: pborissow

Diff for: src/javaxt/orm/Field.java

@@ -26,7 +26,7 @@ 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);
 
@@ -96,8 +96,17 @@ else if (type.equalsIgnoreCase("geometry")){
             else{ //Single model
 
                 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);
+                }
+
             }
 
         }

Diff for: src/javaxt/orm/Model.java

@@ -72,7 +72,7 @@ protected Model(String modelName, JSONObject modelInfo, String packageName, Hash
                 if (name.equalsIgnoreCase("id")) continue;
 
               //Create field and update the fields array
-                Field field = new Field(name, type);
+                Field field = new Field(name, type, this);
                 addConstraints(field, f.toJSONObject());
                 this.fields.add(field);
             }
@@ -84,7 +84,7 @@ 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);
         }