Changeset 3054

Timestamp:

07/11/2008 08:14:22 AM (4 months ago)

Author:

Shadowhand

Message:

Moved ORM2 to ORM.

Files:

• trunk/system/libraries/ORM.php (copied) (copied from trunk/system/libraries/ORM2.php) (9 diffs, 1 prop)

trunk/system/libraries/ORM.php

@@ -1 +1 @@
 <?php defined('SYSPATH') or die('No direct script access.');
-
-class ORM2_Core {
+/**
+ * Object Relational Mapping (ORM) is a method of abstracting database
+ * access to standard PHP calls. All table rows are represented as a model.
+ *
+ * @see http://en.wikipedia.org/wiki/Active_record
+ * @see http://en.wikipedia.org/wiki/Object-relational_mapping
+ *
+ * $Id: ORM.php 2975 2008-07-07 00:20:45Z Shadowhand $
+ *
+ * @package    Core
+ * @author     Kohana Team
+ * @copyright  (c) 2007-2008 Kohana Team
+ * @license    http://kohanaphp.com/license.html
+ */
+class ORM_Core {
 
         // Current relationships
@@ -221 +234 @@
 
                         // Load model
-                        $model = ORM2::factory($model);
+                        $model = ORM::factory($model);
 
                         if (isset($this->object[$column.'_'.$model->primary_key]))
@@ -239 +252 @@
                 elseif (in_array($column, $this->has_one) OR in_array($column, $this->belongs_to))
                 {
-                        $model = ORM2::factory($column);
+                        $model = ORM::factory($column);
 
                         if (isset($this->object[$column.'_'.$model->primary_key]))
@@ -253 +266 @@
 
                         // one<>one relationship
-                        return $this->object[$column] = ORM2::factory($column, $where);
+                        return $this->object[$column] = ORM::factory($column, $where);
                 }
                 elseif (isset($this->has_many[$column]))
                 {
                         // Load the "middle" model
-                        $through = ORM2::factory(inflector::singular($this->has_many[$column]));
+                        $through = ORM::factory(inflector::singular($this->has_many[$column]));
 
                         // Load the "end" model
-                        $model = ORM2::factory(inflector::singular($column));
+                        $model = ORM::factory(inflector::singular($column));
 
                         // Load JOIN info
@@ -277 +290 @@
                 {
                         // one<>many relationship
-                        return $this->object[$column] = ORM2::factory(inflector::singular($column))
+                        return $this->object[$column] = ORM::factory(inflector::singular($column))
                                 ->where($this->foreign_key($column), $this->object[$this->primary_key])
                                 ->find_all();
@@ -284 +297 @@
                 {
                         // Load the remote model, always singular
-                        $model = ORM2::factory(inflector::singular($column));
+                        $model = ORM::factory(inflector::singular($column));
 
                         // Load JOIN info
@@ -565 +578 @@
 
                 // Load the model
-                $model = ORM2::factory($object);
+                $model = ORM::factory($object);
 
                 if (is_int($join_table))
@@ -601 +614 @@
 
                 // Load the model
-                $model = ORM2::factory($object);
+                $model = ORM::factory($object);
 
                 // Load JOIN table
@@ -632 +645 @@
 
                 // Load the model
-                $model = ORM2::factory($object);
+                $model = ORM::factory($object);
 
                 // Load JOIN table