When setting a foreign property using the foreignkey_id -> foreignkey shortcut, ORM checks that the correct table has been passed.

More improved exception messages.

Author: Nik Barham

src/Automatorm/Exception/Model.php

@@ -73,7 +73,10 @@ private function make_message($code, $data)
 
             case 'MODEL_DATA:UNEXPECTED_COLUMN_NAME':
                 list($model, $column, $value) = $data;
-                return 'MODEL_DATA:UNEXPECTED_COLUMN_NAME: Property "'.$column.'" does not exist in the schema for this object ('.$model->table_name.'). Please check the $model for this object, or look at $obj->var_dump()';
+                if ($model['columns'][$column . '_id']) {
+                    return 'MODEL_DATA:UNEXPECTED_COLUMN_NAME: Property "'.$column.'" does not exist in the schema for this object ('.$model['table_name'].'), but "'.$column.'_id" does. You probably haven\'t set up the foreign key for this column!';
+                }
+                return 'MODEL_DATA:UNEXPECTED_COLUMN_NAME: Property "'.$column.'" does not exist in the schema for this object ('.$model['table_name'].'). Please check the $model for this object, or look at $obj->var_dump()';
 
             case 'MODEL_DATA_UPDATE:PIVOT_INCORRECT_OBJECT_TYPE':
                 list($value, $table, $pivot) = $data;
@@ -84,9 +87,12 @@ private function make_message($code, $data)
                 list($column, $value) = $data;
                 return 'MODEL_DATA:CANNOT_CALL_MULTIPIVOT_AS_PROPERTY: Property "'.$column.'" represents a M-M (Pivot) relationship with more than two keys. As we don\'t know which type of object to return (as there are multiple choices), you can\'t call this link as a simple property. Use the $model->property([\$where]) syntax instead.';
 
-            case 'MODEL_DATA:CANNOT_DELETE_UNCOMMITED_DATA';
+            case 'MODEL_DATA:CANNOT_DELETE_UNCOMMITED_DATA':
                 return 'MODEL_DATA:CANNOT_DELETE_UNCOMMITED_DATA: You cannot mark a Data object for deletion if it does not represent an existing row in the database.';
 
+            case 'MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP':
+                list($column, $supplied_table, $expected_table) = $data;
+                return 'MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP: Property "'.$column.'" expected a Model relating to table "'.$expected_table.'" but a Model for "'.$supplied_table.'" was given instead.';
             default:
                 return "Unknown error code ({$code})";
         }

src/Automatorm/Orm/Data.php

@@ -581,11 +581,16 @@ public function __set($var, $value)
                 $this->external[$var] = null;
                 return;
             } elseif ($value instanceof Model) {
+                // Trying to pass in the wrong table for the relationship!
+                // That is, the table name on the foreign key does not match the table name in the passed Model object
+                if ($value->data(true)->table !== $this->schema->getTable($var)['table_name']) {
+                    throw new Exception\Model('MODEL_DATA:INCORRECT_MODEL_FOR_RELATIONSHIP', [$var, $value->table, $this->schema->model[$var]['table_name']]);
+                }
                 $this->data[$var.'_id'] = $value->id;
                 $this->external[$var] = $value;
                 return;
             } else {
-                throw new Exception\Model('MODEL_DATA:MODEL_EXPECTED_FOR_KEY', array($var, $value));
+                throw new Exception\Model('MODEL_DATA:MODEL_EXPECTED_FOR_KEY', [$var, $value]);
             }
         }
 

src/Automatorm/Orm/Schema.php

@@ -191,21 +191,21 @@ public static function generateSchema($dbconnection)
     private static $stringCacheN = []; 
     public static function normaliseCase($string)
     {
-        if (static::$stringCacheN[$string]) return static::$stringCacheN[$string];
+        if (isset(static::$stringCacheN[$string])) return static::$stringCacheN[$string];
         return static::$stringCacheN[$string] = trim(strtolower(preg_replace('/([A-Z])|_/', ' $1', $string)));
     }
 
     private static $stringCacheC = []; 
     public static function camelCase($string)
     {
-        if (static::$stringCacheC[$string]) return static::$stringCacheC[$string];
+        if (isset(static::$stringCacheC[$string])) return static::$stringCacheC[$string];
         return static::$stringCacheC[$string] = str_replace(' ', '', ucwords(self::normaliseCase($string)));
     }
 
     private static $stringCacheU = []; 
     public static function underscoreCase($string)
     {
-        if (static::$stringCacheU[$string]) return static::$stringCacheU[$string];
+        if (isset(static::$stringCacheU[$string])) return static::$stringCacheU[$string];
         return static::$stringCacheU[$string] = str_replace(' ', '_', self::normaliseCase($string));
     }
 
@@ -214,7 +214,7 @@ public static function underscoreCase($string)
     public function guessContext($class_or_table)
     {
         // Return 'cached' result
-        if (static::$contextCache[$class_or_table]) return static::$contextCache[$class_or_table];
+        if (isset(static::$contextCache[$class_or_table])) return static::$contextCache[$class_or_table];
 
         // Namespace classname? Remove that namespace before continuing
         if (strrpos($class_or_table, '\\') !== false) {
@@ -242,7 +242,7 @@ public function guessContext($class_or_table)
 
         // We haven't found an entry in the schema for our best guess table name? Boom!
         if (!$table) {
-            throw new Exception\Model('NO_SCHEMA', [$class_or_table, $normalised, $class, $table]);
+            throw new Exception\Model('NO_SCHEMA', [$class_or_table, $normalised, $class]);
         }
 
         return static::$contextCache[$class_or_table] = [$class, $table];