Changeset 2183

Timestamp:

02/28/2008 10:50:07 AM (9 months ago)

Author:

gregmac

Message:

Add ORM->primary_column property to allow overriding primary field name

Files:

• trunk/system/libraries/ORM.php (modified) (10 diffs)

trunk/system/libraries/ORM.php

@@ -28 +28 @@
         protected $class;
         protected $table;
+        
+        // Primary column name
+        protected $primary_column = 'id';
 
         // SQL building status
@@ -134 +137 @@
                         // Set the model name
                         $model = ucfirst($key).'_Model';
-
-                        if (empty($this->object->id))
+                        
+                        $idcolumn = $this->primary_column;
+                        
+                        if (empty($this->object->$idcolumn))
                         {
                                 // Load an empty model
@@ -149 +154 @@
                                         ? $this->object->$child_id
                                         // Get the foreign object using the primary key of this object
-                                        : array($this->class.'_id', $this->object->id));
+                                        : array($this->class.'_id', $this->object->$idcolumn));
                         }
 
@@ -171 +176 @@
                 }
         }
+
 
         /**
@@ -470 +476 @@
         protected function where_key($id = NULL)
         {
-                return $this->table.'.id';
+                return $this->table.'.'.$this->primary_column;
         }
 
@@ -518 +524 @@
                 if (empty($this->changed))
                         return TRUE;
+                
+                $idcolumn = $this->primary_column;
 
                 $data = array();
@@ -526 +534 @@
                 }
 
-                if ($this->object->id == '')
+                if ($this->object->$idcolumn == '')
                 {
                         // Perform an insert
@@ -534 +542 @@
                         {
                                 // Set current object id by the insert id
-                                $this->object->id = $query->insert_id();
+                                $this->object->$idcolumn = $query->insert_id();
                         }
                 }
@@ -540 +548 @@
                 {
                         // Perform an update
-                        $query = self::$db->update($this->table, $data, array('id' => $this->object->id));
+                        $query = self::$db->update($this->table, $data, array($idcolumn => $this->object->$idcolumn));
                 }
 
@@ -790 +798 @@
                 self::$db->where("$join.$primary", $this->object->id)->join($join, "$join.$foreign", "$table.id");
         }
-
 } // End ORM