Merge branch '3.2/develop' into 3.2/master

classes/config/database.php

@@ -1,12 +1,12 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 /**
  * Transparent extension for the Kohana_Config_Database class
  *
  * @package    Kohana/Database
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2011 Kohana Team
+ * @copyright  (c) 2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Config_Database extends Kohana_Config_Database {}

classes/config/database/reader.php

@@ -6,7 +6,7 @@
  * @package    Kohana/Database
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2011 Kohana Team
+ * @copyright  (c) 2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Config_Database_Reader extends Kohana_Config_Database_Reader

classes/config/database/writer.php

@@ -6,7 +6,7 @@
  * @package    Kohana/Database
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2011 Kohana Team
+ * @copyright  (c) 2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Config_Database_Writer extends Kohana_Config_Database_Writer

classes/database.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 abstract class Database extends Kohana_Database {}

classes/database/exception.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Exception extends Kohana_Database_Exception {}

classes/database/expression.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Expression extends Kohana_Database_Expression {}

classes/database/mysql.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_MySQL extends Kohana_Database_MySQL {}

classes/database/mysql/result.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_MySQL_Result extends Kohana_Database_MySQL_Result {}

classes/database/pdo.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_PDO extends Kohana_Database_PDO {}

classes/database/query.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query extends Kohana_Database_Query {}

classes/database/query/builder.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 abstract class Database_Query_Builder extends Kohana_Database_Query_Builder {}

classes/database/query/builder/delete.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query_Builder_Delete extends Kohana_Database_Query_Builder_Delete {}

classes/database/query/builder/insert.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query_Builder_Insert extends Kohana_Database_Query_Builder_Insert {}

classes/database/query/builder/join.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query_Builder_Join extends Kohana_Database_Query_Builder_Join {}

classes/database/query/builder/select.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query_Builder_Select extends Kohana_Database_Query_Builder_Select {}

classes/database/query/builder/update.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Query_Builder_Update extends Kohana_Database_Query_Builder_Update {}

classes/database/query/builder/where.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 abstract class Database_Query_Builder_Where extends Kohana_Database_Query_Builder_Where {}

classes/database/result.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 abstract class Database_Result extends Kohana_Database_Result {}

classes/database/result/cached.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class Database_Result_Cached extends Kohana_Database_Result_Cached {}

classes/db.php

@@ -1,3 +1,3 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 class DB extends Kohana_DB {}

classes/kohana/config/database.php

@@ -1,15 +1,15 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 
 /**
  * Backwards compatibility extension for the database writer.
  *
  * @package    Kohana/Database
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2011 Kohana Team
+ * @copyright  (c) 2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Kohana_Config_Database extends Kohana_Config_Database_Writer
 {
-	
+
 }

classes/kohana/config/database/reader.php

@@ -6,12 +6,12 @@
  * @package    Kohana/Database
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2011 Kohana Team
+ * @copyright  (c) 2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Kohana_Config_Database_Reader implements Kohana_Config_Reader
 {
-	protected $_db_instance = 'default';
+	protected $_db_instance;
 
 	protected $_table_name  = 'config';
 
@@ -26,6 +26,10 @@ public function __construct(array $config = NULL)
 		{
 			$this->_db_instance = $config['instance'];
 		}
+		elseif ($this->_db_instance === NULL)
+		{
+			$this->_db_instance = Database::$default;
+		}
 
 		if (isset($config['table_name']))
 		{
@@ -43,6 +47,15 @@ public function __construct(array $config = NULL)
 	 */
 	public function load($group)
 	{
+		/**
+		 * Prevents the catch-22 scenario where the database config reader attempts to load the 
+		 * database connections details from the database.
+		 *
+		 * @link http://dev.kohanaframework.org/issues/4316
+		 */
+		if ($group === 'database')
+			return FALSE;
+
 		$query = DB::select('config_key', 'config_value')
 			->from($this->_table_name)
 			->where('group_name', '=', $group)

classes/kohana/config/database/writer.php

@@ -6,7 +6,7 @@
  * @package    Kohana
  * @category   Configuration
  * @author     Kohana Team
- * @copyright  (c) 2007-2011 Kohana Team
+ * @copyright  (c) 2007-2012 Kohana Team
  * @license    http://kohanaframework.org/license
  */
 class Kohana_Config_Database_Writer extends Config_Database_Reader implements Kohana_Config_Writer

classes/kohana/database.php

@@ -1,9 +1,9 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 /**
  * Database connection wrapper/helper.
  *
  * You may get a database instance using `Database::instance('name')` where
- * name is the [config](database/config) group. 
+ * name is the [config](database/config) group.
  *
  * This class provides connection instance management via Database Drivers, as
  * well as quoting, escaping and other related functions. Querys are done using
@@ -13,7 +13,7 @@
  * @package    Kohana/Database
  * @category   Base
  * @author     Kohana Team
- * @copyright  (c) 2008-2010 Kohana Team
+ * @copyright  (c) 2008-2012 Kohana Team
  * @license    http://kohanaphp.com/license
  */
 abstract class Kohana_Database {
@@ -45,8 +45,8 @@ abstract class Kohana_Database {
 	 *     // Create a custom configured instance
 	 *     $db = Database::instance('custom', $config);
 	 *
-	 * @param   string   instance name
-	 * @param   array    configuration parameters
+	 * @param   string   $name    instance name
+	 * @param   array    $config  configuration parameters
 	 * @return  Database
 	 */
 	public static function instance($name = NULL, array $config = NULL)
@@ -113,6 +113,11 @@ protected function __construct($name, array $config)
 		// Store the config locally
 		$this->_config = $config;
 
+		if (empty($this->_config['table_prefix']))
+		{
+			$this->_config['table_prefix'] = '';
+		}
+
 		// Store the database instance
 		Database::$instances[$name] = $this;
 	}
@@ -177,7 +182,7 @@ public function disconnect()
 	 *     $db->set_charset('utf8');
 	 *
 	 * @throws  Database_Exception
-	 * @param   string   character set name
+	 * @param   string   $charset  character set name
 	 * @return  void
 	 */
 	abstract public function set_charset($charset);
@@ -191,10 +196,10 @@ abstract public function set_charset($charset);
 	 *     // Make a SELECT query and use "Model_User" for the results
 	 *     $db->query(Database::SELECT, 'SELECT * FROM users LIMIT 1', 'Model_User');
 	 *
-	 * @param   integer  Database::SELECT, Database::INSERT, etc
-	 * @param   string   SQL query
-	 * @param   mixed    result object class string, TRUE for stdClass, FALSE for assoc array
-	 * @param   array    object construct parameters for result class
+	 * @param   integer  $type       Database::SELECT, Database::INSERT, etc
+	 * @param   string   $sql        SQL query
+	 * @param   mixed    $as_object  result object class string, TRUE for stdClass, FALSE for assoc array
+	 * @param   array    $params     object construct parameters for result class
 	 * @return  object   Database_Result for SELECT queries
 	 * @return  array    list (insert id, row count) for INSERT queries
 	 * @return  integer  number of affected rows for all other queries
@@ -219,7 +224,7 @@ abstract public function query($type, $sql, $as_object = FALSE, array $params =
 	 *          $db->rollback();
 	 *      }
 	 *
-	 * @param string transaction mode
+	 * @param string $mode  transaction mode
 	 * @return  boolean
 	 */
 	abstract public function begin($mode = NULL);
@@ -250,7 +255,7 @@ abstract public function rollback();
 	 *     // Get the total number of records in the "users" table
 	 *     $count = $db->count_records('users');
 	 *
-	 * @param   mixed    table name string or array(query, alias)
+	 * @param   mixed    $table  table name string or array(query, alias)
 	 * @return  integer
 	 */
 	public function count_records($table)
@@ -267,7 +272,7 @@ public function count_records($table)
 	 *
 	 *     $db->datatype('char');
 	 *
-	 * @param   string  SQL data type
+	 * @param   string  $type  SQL data type
 	 * @return  array
 	 */
 	public function datatype($type)
@@ -342,7 +347,7 @@ public function datatype($type)
 	 *     // Get all user-related tables
 	 *     $tables = $db->list_tables('user%');
 	 *
-	 * @param   string   table to search for
+	 * @param   string   $like  table to search for
 	 * @return  array
 	 */
 	abstract public function list_tables($like = NULL);
@@ -360,9 +365,9 @@ abstract public function list_tables($like = NULL);
 	 *     // Get the columns from a table that doesn't use the table prefix
 	 *     $columns = $db->list_columns('users', NULL, FALSE);
 	 *
-	 * @param   string  table to get columns from
-	 * @param   string  column to search for
-	 * @param   boolean whether to add the table prefix automatically or not
+	 * @param   string  $table       table to get columns from
+	 * @param   string  $like        column to search for
+	 * @param   boolean $add_prefix  whether to add the table prefix automatically or not
 	 * @return  array
 	 */
 	abstract public function list_columns($table, $like = NULL, $add_prefix = TRUE);
@@ -373,7 +378,7 @@ abstract public function list_columns($table, $like = NULL, $add_prefix = TRUE);
 	 *     // Returns: array('CHAR', '6')
 	 *     list($type, $length) = $db->_parse_type('CHAR(6)');
 	 *
-	 * @param   string
+	 * @param   string  $type
 	 * @return  array   list containing the type and length, if any
 	 */
 	protected function _parse_type($type)
@@ -385,7 +390,7 @@ protected function _parse_type($type)
 		}
 
 		// Closing parenthesis
-		$close = strpos($type, ')', $open);
+		$close = strrpos($type, ')', $open);
 
 		// Length without parentheses
 		$length = substr($type, $open + 1, $close - 1 - $open);
@@ -420,7 +425,7 @@ public function table_prefix()
 	 * [Database_Query] objects will be compiled and converted to a sub-query.
 	 * All other objects will be converted using the `__toString` method.
 	 *
-	 * @param   mixed   any value to quote
+	 * @param   mixed   $value  any value to quote
 	 * @return  string
 	 * @uses    Database::escape
 	 */
@@ -488,7 +493,7 @@ public function quote($value)
 	 * [Database_Query] objects will be compiled and converted to a sub-query.
 	 * All other objects will be converted using the `__toString` method.
 	 *
-	 * @param   mixed   column name or array(column, alias)
+	 * @param   mixed   $column  column name or array(column, alias)
 	 * @return  string
 	 * @uses    Database::quote_identifier
 	 * @uses    Database::table_prefix
@@ -572,7 +577,7 @@ public function quote_column($column)
 	 * [Database_Query] objects will be compiled and converted to a sub-query.
 	 * All other objects will be converted using the `__toString` method.
 	 *
-	 * @param   mixed   table name or array(table, alias)
+	 * @param   mixed   $table  table name or array(table, alias)
 	 * @return  string
 	 * @uses    Database::quote_identifier
 	 * @uses    Database::table_prefix
@@ -644,7 +649,7 @@ public function quote_table($table)
 	 * [Database_Query] objects will be compiled and converted to a sub-query.
 	 * All other objects will be converted using the `__toString` method.
 	 *
-	 * @param   mixed   any identifier
+	 * @param   mixed   $value  any identifier
 	 * @return  string
 	 */
 	public function quote_identifier($value)
@@ -701,7 +706,7 @@ public function quote_identifier($value)
 	 *
 	 *     $value = $db->escape('any string');
 	 *
-	 * @param   string   value to quote
+	 * @param   string   $value  value to quote
 	 * @return  string
 	 */
 	abstract public function escape($value);

classes/kohana/database/exception.php

@@ -1,4 +1,4 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 /**
  * Database exceptions.
  *

classes/kohana/database/expression.php

@@ -1,4 +1,4 @@
-<?php defined('SYSPATH') or die('No direct script access.');
+<?php defined('SYSPATH') OR die('No direct script access.');
 /**
  * Database expressions can be used to add unescaped SQL fragments to a
  * [Database_Query_Builder] object.