Changeset 3336

Timestamp:

08/16/2008 11:13:30 AM (4 months ago)

Author:

Shadowhand

Message:

Updated Database/ORM:

• Combined field_data and list_fields into list_columns
  
• Updated MySQL driver to match (pgsql, mssql, and pdosqlite are NOT updated)
  
• Updated ORM to match
  

Location:

trunk/system/libraries

Files:

• Database.php (modified) (2 diffs)
• ORM.php (modified) (2 diffs)
• drivers/Database.php (modified) (3 diffs)
• drivers/Database/Mysql.php (modified) (2 diffs)
• drivers/Database/Mysqli.php (modified) (1 diff)

trunk/system/libraries/Database.php

@@ -1086 +1086 @@
 
         /**
-         * Lists all the tables in the current database.
-         *
-         * @return  array
-         */
-        public function list_tables()
-        {
-                $this->link or $this->connect();
-
-                $this->reset_select();
-
-                return $this->driver->list_tables();
-        }
-
-        /**
-         * See if a table exists in the database.
-         *
-         * @param   string   table name
-         * @return  boolean
-         */
-        public function table_exists($table_name)
-        {
-                return in_array($this->config['table_prefix'].$table_name, $this->list_tables());
-        }
-
-        /**
          * Combine a SQL statement with the bind values. Used for safe queries.
          *
@@ -1140 +1115 @@
 
         /**
-         * Get the field data for a database table, along with the field's attributes.
-         *
-         * @param   string  table name
+         * See if a table exists in the database.
+         *
+         * @param   string   table name
+         * @return  boolean
+         */
+        public function table_exists($table_name)
+        {
+                return in_array($this->config['table_prefix'].$table_name, $this->list_tables());
+        }
+
+        /**
+         * Lists all the tables in the current database.
+         *
          * @return  array
          */
-        public function field_data($table = '')
+        public function list_tables()
         {
                 $this->link or $this->connect();
 
-                return $this->driver->field_data($this->config['table_prefix'].$table);
-        }
-
-        /**
-         * Get the field data for a database table, along with the field's attributes.
-         *
-         * @param   string  table name
+                return $this->driver->list_tables($this);
+        }
+
+        /**
+         * Lists all columns in a table, and optionally include column metadata.
+         *
+         * @param   string   table name
+         * @param   boolean  include metadata
          * @return  array
          */
-        public function list_fields($table = '')
+        public function list_columns($table, $metadata = FALSE)
         {
                 $this->link or $this->connect();
 
-                return $this->driver->list_fields($this->config['table_prefix'].$table);
+                return $this->driver->list_columns($this->config['table_prefix'].$table, $metadata, $this);
         }
 

trunk/system/libraries/ORM.php

@@ -1 +1 @@
 <?php
 /**
- * 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
+ * [Object Relational Mapping](http://wikipedia.org/wiki/Object-relational_mapping)
+ * (ORM) is a method of abstracting database access to standard PHP calls.
+ * All table rows are represented as model objects, with object properties
+ * representingrow data. ORM in Kohana generally follows the
+ * [Active Record](http://wikipedia.org/wiki/Active_record) pattern.
  *
  * $Id$
@@ -691 +691 @@
                 {
                         // Load table columns
-                        $this->table_columns = $this->db->list_fields($this->table_name);
-
-                        if (empty($this->table_columns))
-                                throw new Kohana_Exception('database.table_not_found', $this->table);
+                        $this->table_columns = $this->db->list_columns($this->table_name, TRUE);
                 }
 

trunk/system/libraries/drivers/Database.php

@@ -338 +338 @@
          * @return  array
          */
-        abstract public function list_tables();
-
-        /**
-         * Lists all fields in a table.
-         *
-         * @param   string  table name
+        abstract public function list_tables(Database $db);
+
+        /**
+         * Lists all columns in a table, and optionally include column metadata.
+         *
+         * @param   string   table name
+         * @param   boolean  include metadata
          * @return  array
          */
-        abstract function list_fields($table);
+        abstract public function list_columns($table, $metadata = FALSE, Database $db);
 
         /**
@@ -354 +355 @@
          */
         abstract public function show_error();
-
-        /**
-         * Returns field data about a table.
-         *
-         * @param   string  table name
-         * @return  array
-         */
-        abstract public function field_data($table);
 
         /**
@@ -397 +390 @@
                 empty($sql_types[$type]) and exit
                 (
-                        'Unknown field type: '.$type.'. '.
+                        'Unknown database column type: '.$type.'. '.
                         'Please report this: http://trac.kohanaphp.com/newticket'
                 );

trunk/system/libraries/drivers/Database/Mysql.php

@@ -256 +256 @@
         }
 
-        public function list_tables()
-        {
-                $sql    = 'SHOW TABLES FROM `'.$this->db_config['connection']['database'].'`';
-                $result = $this->query($sql)->result(FALSE, MYSQL_ASSOC);
-
-                $retval = array();
-                foreach ($result as $row)
-                {
-                        $retval[] = current($row);
-                }
-
-                return $retval;
-        }
-
-        public function show_error()
-        {
-                return mysql_error($this->link);
-        }
-
-        public function list_fields($table)
+        public function list_tables(Database $db)
         {
                 static $tables;
 
-                if (empty($tables[$table]))
-                {
-                        foreach ($this->field_data($table) as $row)
+                if (empty($tables) AND $query = $db->query('SHOW TABLES FROM '.$this->escape_table($this->db_config['connection']['database'])))
+                {
+                        foreach ($query->result(FALSE) as $row)
+                        {
+                                $tables[] = current($row);
+                        }
+                }
+
+                return $tables;
+        }
+
+        public function list_columns($table, $metadata = FALSE, Database $db)
+        {
+                static $columns;
+
+                if (empty($columns[$table]) AND $query = $db->query('SHOW COLUMNS FROM '.$this->escape_table($table)))
+                {
+                        foreach ($query->result(TRUE) as $row)
                         {
                                 // Make an associative array
-                                $tables[$table][$row->Field] = $this->sql_type($row->Type);
+                                $columns[$table][$row->Field] = $this->sql_type($row->Type);
 
                                 if ($row->Key === 'PRI' AND $row->Extra === 'auto_increment')
                                 {
                                         // For sequenced (AUTO_INCREMENT) tables
-                                        $tables[$table][$row->Field]['sequenced'] = TRUE;
+                                        $columns[$table][$row->Field]['sequenced'] = TRUE;
                                 }
 
@@ -295 +291 @@
                                 {
                                         // Set NULL status
-                                        $tables[$table][$row->Field]['null'] = TRUE;
+                                        $columns[$table][$row->Field]['null'] = TRUE;
                                 }
                         }
                 }
 
-                if (!isset($tables[$table]))
+                if ( ! isset($columns[$table]))
                         throw new Kohana_Database_Exception('database.table_not_found', $table);
 
-                return $tables[$table];
-        }
-
-        public function field_data($table)
-        {
-                $columns = array();
-
-                if ($query = mysql_query('SHOW COLUMNS FROM '.$this->escape_table($table), $this->link))
-                {
-                        if (mysql_num_rows($query) > 0)
-                        {
-                                while ($row = mysql_fetch_object($query))
-                                {
-                                        $columns[] = $row;
-                                }
-                        }
-                }
-
-                return $columns;
+                return ($metadata == TRUE) ? $columns[$table] : array_keys($columns[$table]);
+        }
+
+        public function show_error()
+        {
+                return mysql_error($this->link);
         }
 

trunk/system/libraries/drivers/Database/Mysqli.php

@@ -113 +113 @@
         }
 
-        public function field_data($table)
-        {
-                $query  = $this->link->query('SHOW COLUMNS FROM '.$this->escape_table($table));
-
-                $table  = array();
-                while ($row = $query->fetch_object())
-                {
-                        $table[] = $row;
-                }
-
-                return $table;
-        }
-
 } // End Database_Mysqli_Driver Class