Removed "subclass" functionality.

Improved a couple of exception messages.
(Hopefully) improved error on invalid join() call.

Author: Nik Barham

src/Automatorm/Exception/Model.php

@@ -67,8 +67,8 @@ private function make_message($code, $data)
                 return 'Property "'.$column.'" represents a list of objects that have a foreign key that refers to this object. To change this, you must update those objects - you cannot alter this relationship from here.';
 
             case 'MODEL_DATA:UNEXPECTED_COLUMN_NAME':
-                list($column, $value, $model) = $data;
-                return 'Property "'.$column.'" does not exist in the schema for this object. Please check the $model for this object, ot look at $obj->var_dump()';
+                list($model, $column, $value) = $data;
+                return '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;

src/Automatorm/Orm/Data.php

@@ -400,7 +400,7 @@ public function __set($var, $value)
         }
 
         // Undefined column
-        throw new Exception\Model('MODEL_DATA:UNEXPECTED_COLUMN_NAME', array($var, $value, $this->model));
+        throw new Exception\Model('MODEL_DATA:UNEXPECTED_COLUMN_NAME', array($this->model, $var, $value));
     }
 
     public function commit()

src/Automatorm/Orm/Model.php

@@ -23,8 +23,8 @@
 
 class Model implements \JsonSerializable
 {
-    public static $dbconnection = 'default'; // Override database connection associated with this class - for subclasses
-    public static $tablename;                // Override table associated with this class - for subclasses
+    public static $dbconnection = 'default'; // Override database connection associated with this class
+    public static $tablename;                // Override table associated with this class
     protected static $instance;              // An internal store of already created objects so that objects for each row only get created once
 
     /* PUBLIC CONSTRUCTION METHODS */
@@ -85,7 +85,7 @@ final public static function factory($where, $class_or_table_name = null, $datab
 
         // Figure out the base class and table we need based on current context
         $schema = Schema::get($database);
-        list($base_class, $table) = $schema->guessContext($class_or_table_name ?: get_called_class());
+        list($class, $table) = $schema->guessContext($class_or_table_name ?: get_called_class());
 
         // Get data from database        
         $data = Model::factoryData($where, $table, $database, $options);
@@ -100,9 +100,6 @@ final public static function factory($where, $class_or_table_name = null, $datab
             // Database data object unique to this object
             $data_obj = Data::make($row, $table, $schema);
 
-            // Ask the base_class if there is a subclass we should be using.
-            $class = call_user_func(array($base_class, '_subclass'), $data_obj);
-            
             // Create the object!!
             $obj = new $class($data_obj);
 
@@ -276,7 +273,7 @@ public function __get($var)
     public function __call($var, $args)
     {
         try {
-            return $this->_data->join($var, $args[0]);
+            return $this->_data->join($var, (array) $args[0]);
         }
         catch (Exception\Model $e)
         {