Upgrade to KH 3.3.0

includes/kohana/modules/database/classes/Kohana/Config/Database/Reader.php

@@ -0,0 +1,66 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+/**
+ * Database reader for the kohana config system
+ *
+ * @package    Kohana/Database
+ * @category   Configuration
+ * @author     Kohana Team
+ * @copyright  (c) 2012 Kohana Team
+ * @license    http://kohanaframework.org/license
+ */
+class Kohana_Config_Database_Reader implements Kohana_Config_Reader
+{
+	protected $_db_instance;
+
+	protected $_table_name  = 'config';
+
+	/**
+	 * Constructs the database reader object
+	 *
+	 * @param array Configuration for the reader
+	 */
+	public function __construct(array $config = NULL)
+	{
+		if (isset($config['instance']))
+		{
+			$this->_db_instance = $config['instance'];
+		}
+		elseif ($this->_db_instance === NULL)
+		{
+			$this->_db_instance = Database::$default;
+		}
+
+		if (isset($config['table_name']))
+		{
+			$this->_table_name = $config['table_name'];
+		}
+	}
+
+	/**
+	 * Tries to load the specificed configuration group
+	 *
+	 * Returns FALSE if group does not exist or an array if it does
+	 *
+	 * @param  string $group Configuration group
+	 * @return boolean|array
+	 */
+	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)
+			->execute($this->_db_instance);
+
+		return count($query) ? array_map('unserialize', $query->as_array('config_key', 'config_value')) : FALSE;
+	}
+}

includes/kohana/modules/database/classes/Kohana/Config/Database/Writer.php

@@ -0,0 +1,110 @@
+<?php defined('SYSPATH') OR die('No direct script access.');
+
+/**
+ * Database writer for the config system
+ *
+ * @package    Kohana
+ * @category   Configuration
+ * @author     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
+{
+	protected $_loaded_keys = array();
+
+	/**
+	 * Tries to load the specificed configuration group
+	 *
+	 * Returns FALSE if group does not exist or an array if it does
+	 *
+	 * @param  string $group Configuration group
+	 * @return boolean|array
+	 */
+	public function load($group)
+	{
+		$config = parent::load($group);
+
+		if ($config !== FALSE)
+		{
+			$this->_loaded_keys[$group] = array_combine(array_keys($config), array_keys($config));
+		}
+
+		return $config;
+	}
+
+	/**
+	 * Writes the passed config for $group
+	 *
+	 * Returns chainable instance on success or throws 
+	 * Kohana_Config_Exception on failure
+	 *
+	 * @param string      $group  The config group
+	 * @param string      $key    The config key to write to
+	 * @param array       $config The configuration to write
+	 * @return boolean
+	 */
+	public function write($group, $key, $config)
+	{
+		$config = serialize($config);
+
+		// Check to see if we've loaded the config from the table already
+		if (isset($this->_loaded_keys[$group][$key]))
+		{
+			$this->_update($group, $key, $config);
+		}
+		else
+		{
+			// Attempt to run an insert query
+			// This may fail if the config key already exists in the table
+			// and we don't know about it
+			try
+			{
+				$this->_insert($group, $key, $config);
+			}
+			catch (Database_Exception $e)
+			{
+				// Attempt to run an update instead
+				$this->_update($group, $key, $config);
+			}
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Insert the config values into the table
+	 *
+	 * @param string      $group  The config group
+	 * @param string      $key    The config key to write to
+	 * @param array       $config The serialized configuration to write
+	 * @return boolean
+	 */
+	protected function _insert($group, $key, $config)
+	{
+		DB::insert($this->_table_name, array('group_name', 'config_key', 'config_value'))
+			->values(array($group, $key, $config))
+			->execute($this->_db_instance);
+
+		return $this;
+	}
+
+	/**
+	 * Update the config values in the table
+	 *
+	 * @param string      $group  The config group
+	 * @param string      $key    The config key to write to
+	 * @param array       $config The serialized configuration to write
+	 * @return boolean
+	 */
+	protected function _update($group, $key, $config)
+	{
+		DB::update($this->_table_name)
+			->set(array('config_value' => $config))
+			->where('group_name', '=', $group)
+			->where('config_key', '=', $key)
+			->execute($this->_db_instance);
+
+		return $this;
+	}
+}