Changeset 2459

Timestamp:

04/09/2008 01:23:37 PM (6 months ago)

Author:

zombor

Message:

Misc updates to Where class.

Files:

• branches/2.2-database/system/libraries/Database_Where.php (modified) (5 diffs)

branches/2.2-database/system/libraries/Database_Where.php

@@ -1 @@
-<?php //defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') or die('No direct script access.');
 /**
  * Provides database access in a platform agnostic way, using simple query building blocks.
@@ -14 +14 @@
         protected $where = array();
         protected $drivers = array();
-
-        public function __construct($group = 'default')
-        {
-                
-        }
 
         public function where()
@@ -61 +56 @@
         public function build($group = 'default')
         {
-                if (is_string($group))
+                if (is_string($group)) // group name was passed
                 {
                         $config = Config::item('database.'.$group);
@@ -81 +76 @@
                         // Set driver name
                         $driver_class_name = 'Database_'.ucfirst($driver).'_Driver';
-        
+
                         // Load the driver
                         if ( ! Kohana::auto_load($driver))
                                 throw new Kohana_Database_Exception('database.driver_not_supported', $driver_class_name);
-        
+
                         // Initialize the driver
                         $this->drivers[$driver] = new $driver_class_name();
-        
+
                         // Validate the driver
                         if ( ! ($this->drivers[$driver] instanceof Database_Driver))
@@ -99 +94 @@
                 foreach ($this->where as $where)
                 {
-                        if (is_object($where[0]))
+                        if ($where[0] instanceof Database_Where_Core)
                         {
                                 $where_string.=$where[0]->build();