From b030326db6a3ddd30fd96ae3be6194f93b229c56 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 22 May 2013 12:54:20 +0200
Subject: [PATCH] moved files to right places

---
 framework/yii/caching/RedisCache.php      | 193 ++++++++++
 framework/yii/db/redis/ActiveQuery.php    | 374 ++++++++++++++++++++
 framework/yii/db/redis/ActiveRecord.php   | 563 ++++++++++++++++++++++++++++++
 framework/yii/db/redis/ActiveRelation.php | 249 +++++++++++++
 framework/yii/db/redis/Connection.php     | 411 ++++++++++++++++++++++
 framework/yii/db/redis/Transaction.php    |  91 +++++
 framework/yii/db/redis/schema.md          |  35 ++
 yii/caching/RedisCache.php                | 193 ----------
 yii/db/redis/ActiveQuery.php              | 374 --------------------
 yii/db/redis/ActiveRecord.php             | 563 ------------------------------
 yii/db/redis/ActiveRelation.php           | 249 -------------
 yii/db/redis/Connection.php               | 411 ----------------------
 yii/db/redis/Transaction.php              |  91 -----
 yii/db/redis/schema.md                    |  35 --
 14 files changed, 1916 insertions(+), 1916 deletions(-)
 create mode 100644 framework/yii/caching/RedisCache.php
 create mode 100644 framework/yii/db/redis/ActiveQuery.php
 create mode 100644 framework/yii/db/redis/ActiveRecord.php
 create mode 100644 framework/yii/db/redis/ActiveRelation.php
 create mode 100644 framework/yii/db/redis/Connection.php
 create mode 100644 framework/yii/db/redis/Transaction.php
 create mode 100644 framework/yii/db/redis/schema.md
 delete mode 100644 yii/caching/RedisCache.php
 delete mode 100644 yii/db/redis/ActiveQuery.php
 delete mode 100644 yii/db/redis/ActiveRecord.php
 delete mode 100644 yii/db/redis/ActiveRelation.php
 delete mode 100644 yii/db/redis/Connection.php
 delete mode 100644 yii/db/redis/Transaction.php
 delete mode 100644 yii/db/redis/schema.md

diff --git a/framework/yii/caching/RedisCache.php b/framework/yii/caching/RedisCache.php
new file mode 100644
index 0000000..e988c2d
--- /dev/null
+++ b/framework/yii/caching/RedisCache.php
@@ -0,0 +1,193 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\caching;
+
+use yii\db\redis\Connection;
+
+/**
+ * RedisCache implements a cache application component based on [redis](http://redis.io/).
+ *
+ * RedisCache needs to be configured with [[hostname]], [[port]] and [[database]] of the server
+ * to connect to. By default RedisCache assumes there is a redis server running on localhost at
+ * port 6379 and uses the database number 0.
+ *
+ * RedisCache also supports [the AUTH command](http://redis.io/commands/auth) of redis.
+ * When the server needs authentication, you can set the [[password]] property to
+ * authenticate with the server after connect.
+ *
+ * See [[Cache]] manual for common cache operations that RedisCache supports.
+ * Unlike the [[CCache]], RedisCache allows the expire parameter of
+ * [[set]] and [[add]] to be a floating point number, so you may specify the time in milliseconds.
+ *
+ * To use RedisCache as the cache application component, configure the application as follows,
+ *
+ * ~~~
+ * array(
+ *     'components'=>array(
+ *         'cache'=>array(
+ *             'class'=>'RedisCache',
+ *             'hostname'=>'localhost',
+ *             'port'=>6379,
+ *             'database'=>0,
+ *         ),
+ *     ),
+ * )
+ * ~~~
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class RedisCache extends Cache
+{
+	/**
+	 * @var string hostname to use for connecting to the redis server. Defaults to 'localhost'.
+	 */
+	public $hostname = 'localhost';
+	/**
+	 * @var int the port to use for connecting to the redis server. Default port is 6379.
+	 */
+	public $port = 6379;
+	/**
+	 * @var string the password to use to authenticate with the redis server. If not set, no AUTH command will be sent.
+	 */
+	public $password;
+	/**
+	 * @var int the redis database to use. This is an integer value starting from 0. Defaults to 0.
+	 */
+	public $database = 0;
+	/**
+	 * @var float timeout to use for connection to redis. If not set the timeout set in php.ini will be used: ini_get("default_socket_timeout")
+	 */
+	public $timeout = null;
+	/**
+	 * @var \yii\db\redis\Connection the redis connection
+	 */
+	private $_connection;
+
+
+	/**
+	 * Initializes the cache component by establishing a connection to the redis server.
+	 */
+	public function init()
+	{
+		parent::init();
+		$this->getConnection();
+	}
+
+	/**
+	 * Returns the redis connection object.
+	 * Establishes a connection to the redis server if it does not already exists.
+	 *
+	 * TODO throw exception on error
+	 * @return \yii\db\redis\Connection
+	 */
+	public function getConnection()
+	{
+		if ($this->_connection === null) {
+			$this->_connection = new Connection(array(
+				'dsn' => 'redis://' . $this->hostname . ':' . $this->port . '/' . $this->database,
+				'password' => $this->password,
+				'timeout' => $this->timeout,
+			));
+		}
+		return $this->_connection;
+	}
+
+	/**
+	 * Retrieves a value from cache with a specified key.
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key a unique key identifying the cached value
+	 * @return string|boolean the value stored in cache, false if the value is not in the cache or expired.
+	 */
+	protected function getValue($key)
+	{
+		return $this->_connection->executeCommand('GET', array($key));
+	}
+
+	/**
+	 * Retrieves multiple values from cache with the specified keys.
+	 * @param array $keys a list of keys identifying the cached values
+	 * @return array a list of cached values indexed by the keys
+	 */
+	protected function getValues($keys)
+	{
+		$response = $this->_connection->executeCommand('MGET', $keys);
+		$result = array();
+		$i = 0;
+		foreach($keys as $key) {
+			$result[$key] = $response[$i++];
+		}
+		return $result;
+	}
+
+	/**
+	 * Stores a value identified by a key in cache.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param float $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * This can be a floating point number to specify the time in milliseconds.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function setValue($key,$value,$expire)
+	{
+		if ($expire == 0) {
+			return (bool) $this->_connection->executeCommand('SET', array($key, $value));
+		} else {
+			$expire = (int) ($expire * 1000);
+			return (bool) $this->_connection->executeCommand('PSETEX', array($key, $expire, $value));
+		}
+	}
+
+	/**
+	 * Stores a value identified by a key into cache if the cache does not contain this key.
+	 * This is the implementation of the method declared in the parent class.
+	 *
+	 * @param string $key the key identifying the value to be cached
+	 * @param string $value the value to be cached
+	 * @param float $expire the number of seconds in which the cached value will expire. 0 means never expire.
+	 * This can be a floating point number to specify the time in milliseconds.
+	 * @return boolean true if the value is successfully stored into cache, false otherwise
+	 */
+	protected function addValue($key,$value,$expire)
+	{
+		if ($expire == 0) {
+			return (bool) $this->_connection->executeCommand('SETNX', array($key, $value));
+		} else {
+			// TODO consider requiring redis version >= 2.6.12 that supports this in one command
+			$expire = (int) ($expire * 1000);
+			$this->_connection->executeCommand('MULTI');
+			$this->_connection->executeCommand('SETNX', array($key, $value));
+			$this->_connection->executeCommand('PEXPIRE', array($key, $expire));
+			$response = $this->_connection->executeCommand('EXEC');
+			return (bool) $response[0];
+		}
+	}
+
+	/**
+	 * Deletes a value with the specified key from cache
+	 * This is the implementation of the method declared in the parent class.
+	 * @param string $key the key of the value to be deleted
+	 * @return boolean if no error happens during deletion
+	 */
+	protected function deleteValue($key)
+	{
+		return (bool) $this->_connection->executeCommand('DEL', array($key));
+	}
+
+	/**
+	 * Deletes all values from cache.
+	 * This is the implementation of the method declared in the parent class.
+	 * @return boolean whether the flush operation was successful.
+	 */
+	protected function flushValues()
+	{
+		return $this->_connection->executeCommand('FLUSHDB');
+	}
+}
diff --git a/framework/yii/db/redis/ActiveQuery.php b/framework/yii/db/redis/ActiveQuery.php
new file mode 100644
index 0000000..1fbde46
--- /dev/null
+++ b/framework/yii/db/redis/ActiveQuery.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * ActiveRecord class file.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\redis;
+
+/**
+ * ActiveQuery represents a DB query associated with an Active Record class.
+ *
+ * ActiveQuery instances are usually created by [[yii\db\redis\ActiveRecord::find()]]
+ * and [[yii\db\redis\ActiveRecord::count()]].
+ *
+ * ActiveQuery mainly provides the following methods to retrieve the query results:
+ *
+ * - [[one()]]: returns a single record populated with the first row of data.
+ * - [[all()]]: returns all records based on the query results.
+ * - [[count()]]: returns the number of records.
+ * - [[sum()]]: returns the sum over the specified column.
+ * - [[average()]]: returns the average over the specified column.
+ * - [[min()]]: returns the min over the specified column.
+ * - [[max()]]: returns the max over the specified column.
+ * - [[scalar()]]: returns the value of the first column in the first row of the query result.
+ * - [[exists()]]: returns a value indicating whether the query result has data or not.
+ *
+ * You can use query methods, such as [[limit()]], [[orderBy()]] to customize the query options.
+ *
+ * ActiveQuery also provides the following additional query options:
+ *
+ * - [[with()]]: list of relations that this query should be performed with.
+ * - [[indexBy()]]: the name of the column by which the query result should be indexed.
+ * - [[asArray()]]: whether to return each record as an array.
+ *
+ * These options can be configured using methods of the same name. For example:
+ *
+ * ~~~
+ * $customers = Customer::find()->with('orders')->asArray()->all();
+ * ~~~
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class ActiveQuery extends \yii\base\Component
+{
+	/**
+	 * @var string the name of the ActiveRecord class.
+	 */
+	public $modelClass;
+	/**
+	 * @var array list of relations that this query should be performed with
+	 */
+	public $with;
+	/**
+	 * @var string the name of the column by which query results should be indexed by.
+	 * This is only used when the query result is returned as an array when calling [[all()]].
+	 */
+	public $indexBy;
+	/**
+	 * @var boolean whether to return each record as an array. If false (default), an object
+	 * of [[modelClass]] will be created to represent each record.
+	 */
+	public $asArray;
+	/**
+	 * @var integer maximum number of records to be returned. If not set or less than 0, it means no limit.
+	 */
+	public $limit;
+	/**
+	 * @var integer zero-based offset from where the records are to be returned.
+	 * If not set, it means starting from the beginning.
+	 * If less than zero it means starting n elements from the end.
+	 */
+	public $offset;
+	/**
+	 * @var array array of primary keys of the records to find.
+	 */
+	public $primaryKeys;
+
+	/**
+	 * List of multiple pks must be zero based
+	 *
+	 * @param $primaryKeys
+	 * @return ActiveQuery
+	 */
+	public function primaryKeys($primaryKeys) {
+		if (is_array($primaryKeys) && isset($primaryKeys[0])) {
+			$this->primaryKeys = $primaryKeys;
+		} else {
+			$this->primaryKeys = array($primaryKeys);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Executes query and returns all results as an array.
+	 * @return array the query results. If the query results in nothing, an empty array will be returned.
+	 */
+	public function all()
+	{
+		$modelClass = $this->modelClass;
+		/** @var Connection $db */
+		$db = $modelClass::getDb();
+		if (($primaryKeys = $this->primaryKeys) === null) {
+			$start = $this->offset === null ? 0 : $this->offset;
+			$end = $this->limit === null ? -1 : $start + $this->limit;
+			$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $end));
+		}
+		$rows = array();
+		foreach($primaryKeys as $pk) {
+			$key = $modelClass::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
+			// get attributes
+			$data = $db->executeCommand('HGETALL', array($key));
+			$row = array();
+			for($i=0;$i<count($data);) {
+				$row[$data[$i++]] = $data[$i++];
+			}
+			$rows[] = $row;
+		}
+		if ($rows !== array()) {
+			$models = $this->createModels($rows);
+			if (!empty($this->with)) {
+				$this->populateRelations($models, $this->with);
+			}
+			return $models;
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Executes query and returns a single row of result.
+	 * @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
+	 * the query result may be either an array or an ActiveRecord object. Null will be returned
+	 * if the query results in nothing.
+	 */
+	public function one()
+	{
+		$modelClass = $this->modelClass;
+		/** @var Connection $db */
+		$db = $modelClass::getDb();
+		if (($primaryKeys = $this->primaryKeys) === null) {
+			$start = $this->offset === null ? 0 : $this->offset;
+			$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $start + 1));
+		}
+		$pk = reset($primaryKeys);
+		$key = $modelClass::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
+		// get attributes
+		$data = $db->executeCommand('HGETALL', array($key));
+		if ($data === array()) {
+			return null;
+		}
+		$row = array();
+		for($i=0;$i<count($data);) {
+			$row[$data[$i++]] = $data[$i++];
+		}
+		if (!$this->asArray) {
+			/** @var $class ActiveRecord */
+			$class = $this->modelClass;
+			$model = $class::create($row);
+			if (!empty($this->with)) {
+				$models = array($model);
+				$this->populateRelations($models, $this->with);
+				$model = $models[0];
+			}
+			return $model;
+		} else {
+			return $row;
+		}
+	}
+
+	/**
+	 * Returns the number of records.
+	 * @param string $q the COUNT expression. Defaults to '*'.
+	 * Make sure you properly quote column names.
+	 * @return integer number of records
+	 */
+	public function count()
+	{
+		$modelClass = $this->modelClass;
+		/** @var Connection $db */
+		$db = $modelClass::getDb();
+		return $db->executeCommand('LLEN', array($modelClass::tableName()));
+	}
+
+	/**
+	 * Returns the query result as a scalar value.
+	 * The value returned will be the first column in the first row of the query results.
+	 * @return string|boolean the value of the first column in the first row of the query result.
+	 * False is returned if the query result is empty.
+	 */
+	public function scalar($column)
+	{
+		$record = $this->one();
+		return $record->$column;
+	}
+
+	/**
+	 * Returns a value indicating whether the query result contains any row of data.
+	 * @return boolean whether the query result contains any row of data.
+	 */
+	public function exists()
+	{
+		return $this->one() !== null;
+	}
+
+
+	/**
+	 * Sets the [[asArray]] property.
+	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	 * @param boolean $value whether to return the query results in terms of arrays instead of Active Records.
+	 * @return ActiveQuery the query object itself
+	 */
+	public function asArray($value = true)
+	{
+		$this->asArray = $value;
+		return $this;
+	}
+
+	/**
+	 * Sets the LIMIT part of the query.
+	 * TODO: refactor, it is duplicated from yii/db/Query
+	 * @param integer $limit the limit
+	 * @return Query the query object itself
+	 */
+	public function limit($limit)
+	{
+		$this->limit = $limit;
+		return $this;
+	}
+
+	/**
+	 * Sets the OFFSET part of the query.
+	 * TODO: refactor, it is duplicated from yii/db/Query
+	 * @param integer $offset the offset
+	 * @return Query the query object itself
+	 */
+	public function offset($offset)
+	{
+		$this->offset = $offset;
+		return $this;
+	}
+
+	/**
+	 * Specifies the relations with which this query should be performed.
+	 *
+	 * The parameters to this method can be either one or multiple strings, or a single array
+	 * of relation names and the optional callbacks to customize the relations.
+	 *
+	 * The followings are some usage examples:
+	 *
+	 * ~~~
+	 * // find customers together with their orders and country
+	 * Customer::find()->with('orders', 'country')->all();
+	 * // find customers together with their country and orders of status 1
+	 * Customer::find()->with(array(
+	 *     'orders' => function($query) {
+	 *         $query->andWhere('status = 1');
+	 *     },
+	 *     'country',
+	 * ))->all();
+	 * ~~~
+	 *
+	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	 * @return ActiveQuery the query object itself
+	 */
+	public function with()
+	{
+		$this->with = func_get_args();
+		if (isset($this->with[0]) && is_array($this->with[0])) {
+			// the parameter is given as an array
+			$this->with = $this->with[0];
+		}
+		return $this;
+	}
+
+	/**
+	 * Sets the [[indexBy]] property.
+	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	 * @param string $column the name of the column by which the query results should be indexed by.
+	 * @return ActiveQuery the query object itself
+	 */
+	public function indexBy($column)
+	{
+		$this->indexBy = $column;
+		return $this;
+	}
+
+	// TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	private function createModels($rows)
+	{
+		$models = array();
+		if ($this->asArray) {
+			if ($this->indexBy === null) {
+				return $rows;
+			}
+			foreach ($rows as $row) {
+				$models[$row[$this->indexBy]] = $row;
+			}
+		} else {
+			/** @var $class ActiveRecord */
+			$class = $this->modelClass;
+			if ($this->indexBy === null) {
+				foreach ($rows as $row) {
+					$models[] = $class::create($row);
+				}
+			} else {
+				foreach ($rows as $row) {
+					$model = $class::create($row);
+					$models[$model->{$this->indexBy}] = $model;
+				}
+			}
+		}
+		return $models;
+	}
+
+	// TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	private function populateRelations(&$models, $with)
+	{
+		$primaryModel = new $this->modelClass;
+		$relations = $this->normalizeRelations($primaryModel, $with);
+		foreach ($relations as $name => $relation) {
+			if ($relation->asArray === null) {
+				// inherit asArray from primary query
+				$relation->asArray = $this->asArray;
+			}
+			$relation->findWith($name, $models);
+		}
+	}
+
+	/**
+	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
+	 * @param ActiveRecord $model
+	 * @param array $with
+	 * @return ActiveRelation[]
+	 */
+	private function normalizeRelations($model, $with)
+	{
+		$relations = array();
+		foreach ($with as $name => $callback) {
+			if (is_integer($name)) {
+				$name = $callback;
+				$callback = null;
+			}
+			if (($pos = strpos($name, '.')) !== false) {
+				// with sub-relations
+				$childName = substr($name, $pos + 1);
+				$name = substr($name, 0, $pos);
+			} else {
+				$childName = null;
+			}
+
+			$t = strtolower($name);
+			if (!isset($relations[$t])) {
+				$relation = $model->getRelation($name);
+				$relation->primaryModel = null;
+				$relations[$t] = $relation;
+			} else {
+				$relation = $relations[$t];
+			}
+
+			if (isset($childName)) {
+				$relation->with[$childName] = $callback;
+			} elseif ($callback !== null) {
+				call_user_func($callback, $relation);
+			}
+		}
+		return $relations;
+	}
+}
diff --git a/framework/yii/db/redis/ActiveRecord.php b/framework/yii/db/redis/ActiveRecord.php
new file mode 100644
index 0000000..4c495e1
--- /dev/null
+++ b/framework/yii/db/redis/ActiveRecord.php
@@ -0,0 +1,563 @@
+<?php
+/**
+ * ActiveRecord class file.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\redis;
+
+use yii\base\InvalidConfigException;
+use yii\base\InvalidParamException;
+use yii\base\NotSupportedException;
+use yii\base\UnknownMethodException;
+use yii\db\TableSchema;
+
+/**
+ * ActiveRecord is the base class for classes representing relational data in terms of objects.
+ *
+ * @include @yii/db/ActiveRecord.md
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+abstract class ActiveRecord extends \yii\db\ActiveRecord
+{
+	/**
+	 * Returns the database connection used by this AR class.
+	 * By default, the "redis" application component is used as the database connection.
+	 * You may override this method if you want to use a different database connection.
+	 * @return Connection the database connection used by this AR class.
+	 */
+	public static function getDb()
+	{
+		return \Yii::$app->redis;
+	}
+
+	/**
+	 * Creates an [[ActiveQuery]] instance for query purpose.
+	 *
+	 * @include @yii/db/ActiveRecord-find.md
+	 *
+	 * @param mixed $q the query parameter. This can be one of the followings:
+	 *
+	 *  - a scalar value (integer or string): query by a single primary key value and return the
+	 *    corresponding record.
+	 *  - an array of name-value pairs: query by a set of column values and return a single record matching all of them.
+	 *  - null: return a new [[ActiveQuery]] object for further query purpose.
+	 *
+	 * @return ActiveQuery|ActiveRecord|null When `$q` is null, a new [[ActiveQuery]] instance
+	 * is returned; when `$q` is a scalar or an array, an ActiveRecord object matching it will be
+	 * returned (null will be returned if there is no matching).
+	 * @see createQuery()
+	 */
+	public static function find($q = null) // TODO optimize API
+	{
+		$query = static::createQuery();
+		if (is_array($q)) {
+			return $query->primaryKeys($q)->one();
+		} elseif ($q !== null) {
+			// query by primary key
+			$primaryKey = static::primaryKey();
+			return $query->primaryKeys(array($primaryKey[0] => $q))->one();
+		}
+		return $query;
+	}
+
+	/**
+	 * Creates an [[ActiveQuery]] instance with a given SQL statement.
+	 *
+	 * Note that because the SQL statement is already specified, calling additional
+	 * query modification methods (such as `where()`, `order()`) on the created [[ActiveQuery]]
+	 * instance will have no effect. However, calling `with()`, `asArray()` or `indexBy()` is
+	 * still fine.
+	 *
+	 * Below is an example:
+	 *
+	 * ~~~
+	 * $customers = Customer::findBySql('SELECT * FROM tbl_customer')->all();
+	 * ~~~
+	 *
+	 * @param string $sql the SQL statement to be executed
+	 * @param array $params parameters to be bound to the SQL statement during execution.
+	 * @return ActiveQuery the newly created [[ActiveQuery]] instance
+	 */
+	public static function findBySql($sql, $params = array())
+	{
+		throw new NotSupportedException('findBySql() is not supported by redis ActiveRecord');
+	}
+
+
+
+	/**
+	 * Creates an [[ActiveQuery]] instance.
+	 * This method is called by [[find()]], [[findBySql()]] and [[count()]] to start a SELECT query.
+	 * You may override this method to return a customized query (e.g. `CustomerQuery` specified
+	 * written for querying `Customer` purpose.)
+	 * @return ActiveQuery the newly created [[ActiveQuery]] instance.
+	 */
+	public static function createQuery()
+	{
+		return new ActiveQuery(array(
+			'modelClass' => get_called_class(),
+		));
+	}
+
+
+	/**
+	 * Returns the schema information of the DB table associated with this AR class.
+	 * @return TableSchema the schema information of the DB table associated with this AR class.
+	 */
+	public static function getTableSchema()
+	{
+		throw new InvalidConfigException(__CLASS__.'::getTableSchema() needs to be overridden in subclasses and return a TableSchema.');
+	}
+
+	/**
+	 * Inserts a row into the associated database table using the attribute values of this record.
+	 *
+	 * This method performs the following steps in order:
+	 *
+	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
+	 *    fails, it will skip the rest of the steps;
+	 * 2. call [[afterValidate()]] when `$runValidation` is true.
+	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
+	 *    rest of the steps;
+	 * 4. insert the record into database. If this fails, it will skip the rest of the steps;
+	 * 5. call [[afterSave()]];
+	 *
+	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
+	 * [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
+	 * will be raised by the corresponding methods.
+	 *
+	 * Only the [[changedAttributes|changed attribute values]] will be inserted into database.
+	 *
+	 * If the table's primary key is auto-incremental and is null during insertion,
+	 * it will be populated with the actual value after insertion.
+	 *
+	 * For example, to insert a customer record:
+	 *
+	 * ~~~
+	 * $customer = new Customer;
+	 * $customer->name = $name;
+	 * $customer->email = $email;
+	 * $customer->insert();
+	 * ~~~
+	 *
+	 * @param boolean $runValidation whether to perform validation before saving the record.
+	 * If the validation fails, the record will not be inserted into the database.
+	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
+	 * meaning all attributes that are loaded from DB will be saved.
+	 * @return boolean whether the attributes are valid and the record is inserted successfully.
+	 */
+	public function insert($runValidation = true, $attributes = null)
+	{
+		if ($runValidation && !$this->validate($attributes)) {
+			return false;
+		}
+		if ($this->beforeSave(true)) {
+			$db = static::getDb();
+			$values = $this->getDirtyAttributes($attributes);
+			$pk = array();
+//			if ($values === array()) {
+				foreach ($this->primaryKey() as $key) {
+					$pk[$key] = $values[$key] = $this->getAttribute($key);
+					if ($pk[$key] === null) {
+						$pk[$key] = $values[$key] = $db->executeCommand('INCR', array(static::tableName() . ':s:' . $key));
+						$this->setAttribute($key, $values[$key]);
+					}
+				}
+//			}
+			// save pk in a findall pool
+			$db->executeCommand('RPUSH', array(static::tableName(), implode('-', $pk))); // TODO escape PK glue
+
+			$key = static::tableName() . ':a:' . implode('-', $pk); // TODO escape PK glue
+			// save attributes
+			$args = array($key);
+			foreach($values as $attribute => $value) {
+				$args[] = $attribute;
+				$args[] = $value;
+			}
+			$db->executeCommand('HMSET', $args);
+
+			$this->setOldAttributes($values);
+			$this->afterSave(true);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Updates the whole table using the provided attribute values and conditions.
+	 * For example, to change the status to be 1 for all customers whose status is 2:
+	 *
+	 * ~~~
+	 * Customer::updateAll(array('status' => 1), 'status = 2');
+	 * ~~~
+	 *
+	 * @param array $attributes attribute values (name-value pairs) to be saved into the table
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return integer the number of rows updated
+	 */
+	public static function updateAll($attributes, $condition = '', $params = array())
+	{
+		$db = static::getDb();
+		if ($condition==='') {
+			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
+		}
+		if (empty($attributes)) {
+			return 0;
+		}
+		$n=0;
+		foreach($condition as $pk) {
+			$key = static::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
+			// save attributes
+			$args = array($key);
+			foreach($attributes as $attribute => $value) {
+				$args[] = $attribute;
+				$args[] = $value;
+			}
+			$db->executeCommand('HMSET', $args);
+			$n++;
+		}
+
+		return $n;
+	}
+
+	/**
+	 * Updates the whole table using the provided counter changes and conditions.
+	 * For example, to increment all customers' age by 1,
+	 *
+	 * ~~~
+	 * Customer::updateAllCounters(array('age' => 1));
+	 * ~~~
+	 *
+	 * @param array $counters the counters to be updated (attribute name => increment value).
+	 * Use negative values if you want to decrement the counters.
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * Do not name the parameters as `:bp0`, `:bp1`, etc., because they are used internally by this method.
+	 * @return integer the number of rows updated
+	 */
+	public static function updateAllCounters($counters, $condition = '', $params = array())
+	{
+		if (is_array($condition) && !isset($condition[0])) { // TODO do this in all *All methods
+			$condition = array($condition);
+		}
+		$db = static::getDb();
+		if ($condition==='') {
+			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
+		}
+		$n=0;
+		foreach($condition as $pk) { // TODO allow multiple pks as condition
+			$key = static::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
+			foreach($counters as $attribute => $value) {
+				$db->executeCommand('HINCRBY', array($key, $attribute, $value));
+			}
+			$n++;
+		}
+		return $n;
+	}
+
+	/**
+	 * Deletes rows in the table using the provided conditions.
+	 * WARNING: If you do not specify any condition, this method will delete ALL rows in the table.
+	 *
+	 * For example, to delete all customers whose status is 3:
+	 *
+	 * ~~~
+	 * Customer::deleteAll('status = 3');
+	 * ~~~
+	 *
+	 * @param string|array $condition the conditions that will be put in the WHERE part of the DELETE SQL.
+	 * Please refer to [[Query::where()]] on how to specify this parameter.
+	 * @param array $params the parameters (name=>value) to be bound to the query.
+	 * @return integer the number of rows deleted
+	 */
+	public static function deleteAll($condition = '', $params = array())
+	{
+		$db = static::getDb();
+		if ($condition==='') {
+			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
+		}
+		if (empty($condition)) {
+			return 0;
+		}
+		$attributeKeys = array();
+		foreach($condition as $pk) {
+			if (is_array($pk)) {
+				$pk = implode('-', $pk);
+			}
+			$db->executeCommand('LREM', array(static::tableName(), 0, $pk)); // TODO escape PK glue
+			$attributeKeys[] = static::tableName() . ':a:' . $pk; // TODO escape PK glue
+		}
+		return $db->executeCommand('DEL', $attributeKeys);
+	}
+
+	/**
+	 * Declares a `has-one` relation.
+	 * The declaration is returned in terms of an [[ActiveRelation]] instance
+	 * through which the related record can be queried and retrieved back.
+	 *
+	 * A `has-one` relation means that there is at most one related record matching
+	 * the criteria set by this relation, e.g., a customer has one country.
+	 *
+	 * For example, to declare the `country` relation for `Customer` class, we can write
+	 * the following code in the `Customer` class:
+	 *
+	 * ~~~
+	 * public function getCountry()
+	 * {
+	 *     return $this->hasOne('Country', array('id' => 'country_id'));
+	 * }
+	 * ~~~
+	 *
+	 * Note that in the above, the 'id' key in the `$link` parameter refers to an attribute name
+	 * in the related class `Country`, while the 'country_id' value refers to an attribute name
+	 * in the current AR class.
+	 *
+	 * Call methods declared in [[ActiveRelation]] to further customize the relation.
+	 *
+	 * @param string $class the class name of the related record
+	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
+	 * the columns in the table associated with the `$class` model, while the values of the
+	 * array refer to the corresponding columns in the table associated with this AR class.
+	 * @return ActiveRelation the relation object.
+	 */
+	public function hasOne($class, $link)
+	{
+		return new ActiveRelation(array(
+			'modelClass' => $this->getNamespacedClass($class),
+			'primaryModel' => $this,
+			'link' => $link,
+			'multiple' => false,
+		));
+	}
+
+	/**
+	 * Declares a `has-many` relation.
+	 * The declaration is returned in terms of an [[ActiveRelation]] instance
+	 * through which the related record can be queried and retrieved back.
+	 *
+	 * A `has-many` relation means that there are multiple related records matching
+	 * the criteria set by this relation, e.g., a customer has many orders.
+	 *
+	 * For example, to declare the `orders` relation for `Customer` class, we can write
+	 * the following code in the `Customer` class:
+	 *
+	 * ~~~
+	 * public function getOrders()
+	 * {
+	 *     return $this->hasMany('Order', array('customer_id' => 'id'));
+	 * }
+	 * ~~~
+	 *
+	 * Note that in the above, the 'customer_id' key in the `$link` parameter refers to
+	 * an attribute name in the related class `Order`, while the 'id' value refers to
+	 * an attribute name in the current AR class.
+	 *
+	 * @param string $class the class name of the related record
+	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
+	 * the columns in the table associated with the `$class` model, while the values of the
+	 * array refer to the corresponding columns in the table associated with this AR class.
+	 * @return ActiveRelation the relation object.
+	 */
+	public function hasMany($class, $link)
+	{
+		return new ActiveRelation(array(
+			'modelClass' => $this->getNamespacedClass($class),
+			'primaryModel' => $this,
+			'link' => $link,
+			'multiple' => true,
+		));
+	}
+
+	/**
+	 * Returns the relation object with the specified name.
+	 * A relation is defined by a getter method which returns an [[ActiveRelation]] object.
+	 * It can be declared in either the Active Record class itself or one of its behaviors.
+	 * @param string $name the relation name
+	 * @return ActiveRelation the relation object
+	 * @throws InvalidParamException if the named relation does not exist.
+	 */
+	public function getRelation($name)
+	{
+		$getter = 'get' . $name;
+		try {
+			$relation = $this->$getter();
+			if ($relation instanceof ActiveRelation) {
+				return $relation;
+			}
+		} catch (UnknownMethodException $e) {
+		}
+		throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
+	}
+
+	/**
+	 * Establishes the relationship between two models.
+	 *
+	 * The relationship is established by setting the foreign key value(s) in one model
+	 * to be the corresponding primary key value(s) in the other model.
+	 * The model with the foreign key will be saved into database without performing validation.
+	 *
+	 * If the relationship involves a pivot table, a new row will be inserted into the
+	 * pivot table which contains the primary key values from both models.
+	 *
+	 * Note that this method requires that the primary key value is not null.
+	 *
+	 * @param string $name the name of the relationship
+	 * @param ActiveRecord $model the model to be linked with the current one.
+	 * @param array $extraColumns additional column values to be saved into the pivot table.
+	 * This parameter is only meaningful for a relationship involving a pivot table
+	 * (i.e., a relation set with `[[ActiveRelation::via()]]` or `[[ActiveRelation::viaTable()]]`.)
+	 * @throws InvalidCallException if the method is unable to link two models.
+	 */
+	public function link($name, $model, $extraColumns = array())
+	{
+		// TODO
+		$relation = $this->getRelation($name);
+
+		if ($relation->via !== null) {
+			if (is_array($relation->via)) {
+				/** @var $viaRelation ActiveRelation */
+				list($viaName, $viaRelation) = $relation->via;
+				/** @var $viaClass ActiveRecord */
+				$viaClass = $viaRelation->modelClass;
+				$viaTable = $viaClass::tableName();
+				// unset $viaName so that it can be reloaded to reflect the change
+				unset($this->_related[strtolower($viaName)]);
+			} else {
+				$viaRelation = $relation->via;
+				$viaTable = reset($relation->via->from);
+			}
+			$columns = array();
+			foreach ($viaRelation->link as $a => $b) {
+				$columns[$a] = $this->$b;
+			}
+			foreach ($relation->link as $a => $b) {
+				$columns[$b] = $model->$a;
+			}
+			foreach ($extraColumns as $k => $v) {
+				$columns[$k] = $v;
+			}
+			static::getDb()->createCommand()
+				->insert($viaTable, $columns)->execute();
+		} else {
+			$p1 = $model->isPrimaryKey(array_keys($relation->link));
+			$p2 = $this->isPrimaryKey(array_values($relation->link));
+			if ($p1 && $p2) {
+				if ($this->getIsNewRecord() && $model->getIsNewRecord()) {
+					throw new InvalidCallException('Unable to link models: both models are newly created.');
+				} elseif ($this->getIsNewRecord()) {
+					$this->bindModels(array_flip($relation->link), $this, $model);
+				} else {
+					$this->bindModels($relation->link, $model, $this);
+				}
+			} elseif ($p1) {
+				$this->bindModels(array_flip($relation->link), $this, $model);
+			} elseif ($p2) {
+				$this->bindModels($relation->link, $model, $this);
+			} else {
+				throw new InvalidCallException('Unable to link models: the link does not involve any primary key.');
+			}
+		}
+
+		// update lazily loaded related objects
+		if (!$relation->multiple) {
+			$this->_related[$name] = $model;
+		} elseif (isset($this->_related[$name])) {
+			if ($relation->indexBy !== null) {
+				$indexBy = $relation->indexBy;
+				$this->_related[$name][$model->$indexBy] = $model;
+			} else {
+				$this->_related[$name][] = $model;
+			}
+		}
+	}
+
+	/**
+	 * Destroys the relationship between two models.
+	 *
+	 * The model with the foreign key of the relationship will be deleted if `$delete` is true.
+	 * Otherwise, the foreign key will be set null and the model will be saved without validation.
+	 *
+	 * @param string $name the name of the relationship.
+	 * @param ActiveRecord $model the model to be unlinked from the current one.
+	 * @param boolean $delete whether to delete the model that contains the foreign key.
+	 * If false, the model's foreign key will be set null and saved.
+	 * If true, the model containing the foreign key will be deleted.
+	 * @throws InvalidCallException if the models cannot be unlinked
+	 */
+	public function unlink($name, $model, $delete = false)
+	{
+		// TODO
+		$relation = $this->getRelation($name);
+
+		if ($relation->via !== null) {
+			if (is_array($relation->via)) {
+				/** @var $viaRelation ActiveRelation */
+				list($viaName, $viaRelation) = $relation->via;
+				/** @var $viaClass ActiveRecord */
+				$viaClass = $viaRelation->modelClass;
+				$viaTable = $viaClass::tableName();
+				unset($this->_related[strtolower($viaName)]);
+			} else {
+				$viaRelation = $relation->via;
+				$viaTable = reset($relation->via->from);
+			}
+			$columns = array();
+			foreach ($viaRelation->link as $a => $b) {
+				$columns[$a] = $this->$b;
+			}
+			foreach ($relation->link as $a => $b) {
+				$columns[$b] = $model->$a;
+			}
+			$command = static::getDb()->createCommand();
+			if ($delete) {
+				$command->delete($viaTable, $columns)->execute();
+			} else {
+				$nulls = array();
+				foreach (array_keys($columns) as $a) {
+					$nulls[$a] = null;
+				}
+				$command->update($viaTable, $nulls, $columns)->execute();
+			}
+		} else {
+			$p1 = $model->isPrimaryKey(array_keys($relation->link));
+			$p2 = $this->isPrimaryKey(array_values($relation->link));
+			if ($p1 && $p2 || $p2) {
+				foreach ($relation->link as $a => $b) {
+					$model->$a = null;
+				}
+				$delete ? $model->delete() : $model->save(false);
+			} elseif ($p1) {
+				foreach ($relation->link as $b) {
+					$this->$b = null;
+				}
+				$delete ? $this->delete() : $this->save(false);
+			} else {
+				throw new InvalidCallException('Unable to unlink models: the link does not involve any primary key.');
+			}
+		}
+
+		if (!$relation->multiple) {
+			unset($this->_related[$name]);
+		} elseif (isset($this->_related[$name])) {
+			/** @var $b ActiveRecord */
+			foreach ($this->_related[$name] as $a => $b) {
+				if ($model->getPrimaryKey() == $b->getPrimaryKey()) {
+					unset($this->_related[$name][$a]);
+				}
+			}
+		}
+	}
+
+
+	// TODO implement link and unlink
+}
diff --git a/framework/yii/db/redis/ActiveRelation.php b/framework/yii/db/redis/ActiveRelation.php
new file mode 100644
index 0000000..e01f3a4
--- /dev/null
+++ b/framework/yii/db/redis/ActiveRelation.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * ActiveRecord class file.
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\redis;
+
+use yii\base\NotSupportedException;
+
+/**
+ * ActiveRecord is the base class for classes representing relational data in terms of objects.
+ *
+ *
+ * @author Carsten Brandt <mail@cebe.cc>
+ * @since 2.0
+ */
+class ActiveRelation extends \yii\db\redis\ActiveQuery
+{
+	/**
+	 * @var boolean whether this relation should populate all query results into AR instances.
+	 * If false, only the first row of the results will be retrieved.
+	 */
+	public $multiple;
+	/**
+	 * @var ActiveRecord the primary model that this relation is associated with.
+	 * This is used only in lazy loading with dynamic query options.
+	 */
+	public $primaryModel;
+	/**
+	 * @var array the columns of the primary and foreign tables that establish the relation.
+	 * The array keys must be columns of the table for this relation, and the array values
+	 * must be the corresponding columns from the primary table.
+	 * Do not prefix or quote the column names as this will be done automatically by Yii.
+	 */
+	public $link;
+	/**
+	 * @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]]
+	 * or [[viaTable()]] to set this property instead of directly setting it.
+	 */
+	public $via;
+
+	/**
+	 * Specifies the relation associated with the pivot table.
+	 * @param string $relationName the relation name. This refers to a relation declared in [[primaryModel]].
+	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
+	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
+	 * @return ActiveRelation the relation object itself.
+	 */
+	public function via($relationName, $callable = null)
+	{
+		$relation = $this->primaryModel->getRelation($relationName);
+		$this->via = array($relationName, $relation);
+		if ($callable !== null) {
+			call_user_func($callable, $relation);
+		}
+		return $this;
+	}
+
+	/**
+	 * Specifies the pivot table.
+	 * @param string $tableName the name of the pivot table.
+	 * @param array $link the link between the pivot table and the table associated with [[primaryModel]].
+	 * The keys of the array represent the columns in the pivot table, and the values represent the columns
+	 * in the [[primaryModel]] table.
+	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
+	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
+	 * @return ActiveRelation
+	 * /
+	public function viaTable($tableName, $link, $callable = null)
+	{
+		$relation = new ActiveRelation(array(
+			'modelClass' => get_class($this->primaryModel),
+			'from' => array($tableName),
+			'link' => $link,
+			'multiple' => true,
+			'asArray' => true,
+		));
+		$this->via = $relation;
+		if ($callable !== null) {
+			call_user_func($callable, $relation);
+		}
+		return $this;
+	}*/
+
+	/**
+	 * Finds the related records and populates them into the primary models.
+	 * This method is internally by [[ActiveQuery]]. Do not call it directly.
+	 * @param string $name the relation name
+	 * @param array $primaryModels primary models
+	 * @return array the related models
+	 * @throws InvalidConfigException
+	 */
+	public function findWith($name, &$primaryModels)
+	{
+		if (!is_array($this->link)) {
+			throw new InvalidConfigException('Invalid link: it must be an array of key-value pairs.');
+		}
+
+		if ($this->via instanceof self) {
+			// TODO
+			// via pivot table
+			/** @var $viaQuery ActiveRelation */
+			$viaQuery = $this->via;
+			$viaModels = $viaQuery->findPivotRows($primaryModels);
+			$this->filterByModels($viaModels);
+		} elseif (is_array($this->via)) {
+			// TODO
+			// via relation
+			/** @var $viaQuery ActiveRelation */
+			list($viaName, $viaQuery) = $this->via;
+			$viaQuery->primaryModel = null;
+			$viaModels = $viaQuery->findWith($viaName, $primaryModels);
+			$this->filterByModels($viaModels);
+		} else {
+			$this->filterByModels($primaryModels);
+		}
+
+		if (count($primaryModels) === 1 && !$this->multiple) {
+			$model = $this->one();
+			foreach ($primaryModels as $i => $primaryModel) {
+				if ($primaryModel instanceof ActiveRecord) {
+					$primaryModel->populateRelation($name, $model);
+				} else {
+					$primaryModels[$i][$name] = $model;
+				}
+			}
+			return array($model);
+		} else {
+			$models = $this->all();
+			if (isset($viaModels, $viaQuery)) {
+				$buckets = $this->buildBuckets($models, $this->link, $viaModels, $viaQuery->link);
+			} else {
+				$buckets = $this->buildBuckets($models, $this->link);
+			}
+
+			$link = array_values(isset($viaQuery) ? $viaQuery->link : $this->link);
+			foreach ($primaryModels as $i => $primaryModel) {
+				$key = $this->getModelKey($primaryModel, $link);
+				$value = isset($buckets[$key]) ? $buckets[$key] : ($this->multiple ? array() : null);
+				if ($primaryModel instanceof ActiveRecord) {
+					$primaryModel->populateRelation($name, $value);
+				} else {
+					$primaryModels[$i][$name] = $value;
+				}
+			}
+			return $models;
+		}
+	}
+
+	/**
+	 * @param array $models
+	 * @param array $link
+	 * @param array $viaModels
+	 * @param array $viaLink
+	 * @return array
+	 */
+	private function buildBuckets($models, $link, $viaModels = null, $viaLink = null)
+	{
+		$buckets = array();
+		$linkKeys = array_keys($link);
+		foreach ($models as $i => $model) {
+			$key = $this->getModelKey($model, $linkKeys);
+			if ($this->indexBy !== null) {
+				$buckets[$key][$i] = $model;
+			} else {
+				$buckets[$key][] = $model;
+			}
+		}
+
+		if ($viaModels !== null) {
+			$viaBuckets = array();
+			$viaLinkKeys = array_keys($viaLink);
+			$linkValues = array_values($link);
+			foreach ($viaModels as $viaModel) {
+				$key1 = $this->getModelKey($viaModel, $viaLinkKeys);
+				$key2 = $this->getModelKey($viaModel, $linkValues);
+				if (isset($buckets[$key2])) {
+					foreach ($buckets[$key2] as $i => $bucket) {
+						if ($this->indexBy !== null) {
+							$viaBuckets[$key1][$i] = $bucket;
+						} else {
+							$viaBuckets[$key1][] = $bucket;
+						}
+					}
+				}
+			}
+			$buckets = $viaBuckets;
+		}
+
+		if (!$this->multiple) {
+			foreach ($buckets as $i => $bucket) {
+				$buckets[$i] = reset($bucket);
+			}
+		}
+		return $buckets;
+	}
+
+	/**
+	 * @param ActiveRecord|array $model
+	 * @param array $attributes
+	 * @return string
+	 */
+	private function getModelKey($model, $attributes)
+	{
+		if (count($attributes) > 1) {
+			$key = array();
+			foreach ($attributes as $attribute) {
+				$key[] = $model[$attribute];
+			}
+			return serialize($key);
+		} else {
+			$attribute = reset($attributes);
+			return $model[$attribute];
+		}
+	}
+
+
+	/**
+	 * @param array $models
+	 */
+	private function filterByModels($models)
+	{
+		$attributes = array_keys($this->link);
+		$values = array();
+		if (count($attributes) ===1) {
+			// single key
+			$attribute = reset($this->link);
+			foreach ($models as $model) {
+				$values[] = $model[$attribute];
+			}
+		} else {
+			// composite keys
+			foreach ($models as $model) {
+				$v = array();
+				foreach ($this->link as $attribute => $link) {
+					$v[$attribute] = $model[$link];
+				}
+				$values[] = $v;
+			}
+		}
+		$this->primaryKeys($values);
+	}
+
+}
diff --git a/framework/yii/db/redis/Connection.php b/framework/yii/db/redis/Connection.php
new file mode 100644
index 0000000..72c80de
--- /dev/null
+++ b/framework/yii/db/redis/Connection.php
@@ -0,0 +1,411 @@
+<?php
+/**
+ * Connection class file
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\redis;
+
+use \yii\base\Component;
+use yii\base\InvalidConfigException;
+use \yii\db\Exception;
+use yii\helpers\StringHelper;
+
+/**
+ *
+ *
+ *
+ * @method mixed set($key, $value) Set the string value of a key
+ * @method mixed get($key) Set the string value of a key
+ * TODO document methods
+ *
+ * @since 2.0
+ */
+class Connection extends Component
+{
+	/**
+	 * @event Event an event that is triggered after a DB connection is established
+	 */
+	const EVENT_AFTER_OPEN = 'afterOpen';
+
+	/**
+	 * @var string the Data Source Name, or DSN, contains the information required to connect to the database.
+	 * DSN format: redis://server:port[/db]
+	 * Where db is a zero based integer which refers to the DB to use.
+	 * If no DB is given, ID 0 is used.
+	 *
+	 * Example: redis://localhost:6379/2
+	 */
+	public $dsn;
+	/**
+	 * @var string the password for establishing DB connection. Defaults to null meaning no AUTH command is send.
+	 * See http://redis.io/commands/auth
+	 */
+	public $password;
+	/**
+	 * @var float timeout to use for connection to redis. If not set the timeout set in php.ini will be used: ini_get("default_socket_timeout")
+	 */
+	public $timeout = null;
+
+	/**
+	 * @var array List of available redis commands http://redis.io/commands
+	 */
+	public $redisCommands = array(
+		'BRPOP', // key [key ...] timeout Remove and get the last element in a list, or block until one is available
+		'BRPOPLPUSH', // source destination timeout Pop a value from a list, push it to another list and return it; or block until one is available
+		'CLIENT KILL', // ip:port Kill the connection of a client
+		'CLIENT LIST', // Get the list of client connections
+		'CLIENT GETNAME', // Get the current connection name
+		'CLIENT SETNAME', // connection-name Set the current connection name
+		'CONFIG GET', // parameter Get the value of a configuration parameter
+		'CONFIG SET', // parameter value Set a configuration parameter to the given value
+		'CONFIG RESETSTAT', // Reset the stats returned by INFO
+		'DBSIZE', // Return the number of keys in the selected database
+		'DEBUG OBJECT', // key Get debugging information about a key
+		'DEBUG SEGFAULT', // Make the server crash
+		'DECR', // key Decrement the integer value of a key by one
+		'DECRBY', // key decrement Decrement the integer value of a key by the given number
+		'DEL', // key [key ...] Delete a key
+		'DISCARD', // Discard all commands issued after MULTI
+		'DUMP', // key Return a serialized version of the value stored at the specified key.
+		'ECHO', // message Echo the given string
+		'EVAL', // script numkeys key [key ...] arg [arg ...] Execute a Lua script server side
+		'EVALSHA', // sha1 numkeys key [key ...] arg [arg ...] Execute a Lua script server side
+		'EXEC', // Execute all commands issued after MULTI
+		'EXISTS', // key Determine if a key exists
+		'EXPIRE', // key seconds Set a key's time to live in seconds
+		'EXPIREAT', // key timestamp Set the expiration for a key as a UNIX timestamp
+		'FLUSHALL', // Remove all keys from all databases
+		'FLUSHDB', // Remove all keys from the current database
+		'GET', // key Get the value of a key
+		'GETBIT', // key offset Returns the bit value at offset in the string value stored at key
+		'GETRANGE', // key start end Get a substring of the string stored at a key
+		'GETSET', // key value Set the string value of a key and return its old value
+		'HDEL', // key field [field ...] Delete one or more hash fields
+		'HEXISTS', // key field Determine if a hash field exists
+		'HGET', // key field Get the value of a hash field
+		'HGETALL', // key Get all the fields and values in a hash
+		'HINCRBY', // key field increment Increment the integer value of a hash field by the given number
+		'HINCRBYFLOAT', // key field increment Increment the float value of a hash field by the given amount
+		'HKEYS', // key Get all the fields in a hash
+		'HLEN', // key Get the number of fields in a hash
+		'HMGET', // key field [field ...] Get the values of all the given hash fields
+		'HMSET', // key field value [field value ...] Set multiple hash fields to multiple values
+		'HSET', // key field value Set the string value of a hash field
+		'HSETNX', // key field value Set the value of a hash field, only if the field does not exist
+		'HVALS', // key Get all the values in a hash
+		'INCR', // key Increment the integer value of a key by one
+		'INCRBY', // key increment Increment the integer value of a key by the given amount
+		'INCRBYFLOAT', // key increment Increment the float value of a key by the given amount
+		'INFO', // [section] Get information and statistics about the server
+		'KEYS', // pattern Find all keys matching the given pattern
+		'LASTSAVE', // Get the UNIX time stamp of the last successful save to disk
+		'LINDEX', // key index Get an element from a list by its index
+		'LINSERT', // key BEFORE|AFTER pivot value Insert an element before or after another element in a list
+		'LLEN', // key Get the length of a list
+		'LPOP', // key Remove and get the first element in a list
+		'LPUSH', // key value [value ...] Prepend one or multiple values to a list
+		'LPUSHX', // key value Prepend a value to a list, only if the list exists
+		'LRANGE', // key start stop Get a range of elements from a list
+		'LREM', // key count value Remove elements from a list
+		'LSET', // key index value Set the value of an element in a list by its index
+		'LTRIM', // key start stop Trim a list to the specified range
+		'MGET', // key [key ...] Get the values of all the given keys
+		'MIGRATE', // host port key destination-db timeout Atomically transfer a key from a Redis instance to another one.
+		'MONITOR', // Listen for all requests received by the server in real time
+		'MOVE', // key db Move a key to another database
+		'MSET', // key value [key value ...] Set multiple keys to multiple values
+		'MSETNX', // key value [key value ...] Set multiple keys to multiple values, only if none of the keys exist
+		'MULTI', // Mark the start of a transaction block
+		'OBJECT', // subcommand [arguments [arguments ...]] Inspect the internals of Redis objects
+		'PERSIST', // key Remove the expiration from a key
+		'PEXPIRE', // key milliseconds Set a key's time to live in milliseconds
+		'PEXPIREAT', // key milliseconds-timestamp Set the expiration for a key as a UNIX timestamp specified in milliseconds
+		'PING', // Ping the server
+		'PSETEX', // key milliseconds value Set the value and expiration in milliseconds of a key
+		'PSUBSCRIBE', // pattern [pattern ...] Listen for messages published to channels matching the given patterns
+		'PTTL', // key Get the time to live for a key in milliseconds
+		'PUBLISH', // channel message Post a message to a channel
+		'PUNSUBSCRIBE', // [pattern [pattern ...]] Stop listening for messages posted to channels matching the given patterns
+		'QUIT', // Close the connection
+		'RANDOMKEY', // Return a random key from the keyspace
+		'RENAME', // key newkey Rename a key
+		'RENAMENX', // key newkey Rename a key, only if the new key does not exist
+		'RESTORE', // key ttl serialized-value Create a key using the provided serialized value, previously obtained using DUMP.
+		'RPOP', // key Remove and get the last element in a list
+		'RPOPLPUSH', // source destination Remove the last element in a list, append it to another list and return it
+		'RPUSH', // key value [value ...] Append one or multiple values to a list
+		'RPUSHX', // key value Append a value to a list, only if the list exists
+		'SADD', // key member [member ...] Add one or more members to a set
+		'SAVE', // Synchronously save the dataset to disk
+		'SCARD', // key Get the number of members in a set
+		'SCRIPT EXISTS', // script [script ...] Check existence of scripts in the script cache.
+		'SCRIPT FLUSH', // Remove all the scripts from the script cache.
+		'SCRIPT KILL', // Kill the script currently in execution.
+		'SCRIPT LOAD', // script Load the specified Lua script into the script cache.
+		'SDIFF', // key [key ...] Subtract multiple sets
+		'SDIFFSTORE', // destination key [key ...] Subtract multiple sets and store the resulting set in a key
+		'SELECT', // index Change the selected database for the current connection
+		'SET', // key value Set the string value of a key
+		'SETBIT', // key offset value Sets or clears the bit at offset in the string value stored at key
+		'SETEX', // key seconds value Set the value and expiration of a key
+		'SETNX', // key value Set the value of a key, only if the key does not exist
+		'SETRANGE', // key offset value Overwrite part of a string at key starting at the specified offset
+		'SHUTDOWN', // [NOSAVE] [SAVE] Synchronously save the dataset to disk and then shut down the server
+		'SINTER', // key [key ...] Intersect multiple sets
+		'SINTERSTORE', // destination key [key ...] Intersect multiple sets and store the resulting set in a key
+		'SISMEMBER', // key member Determine if a given value is a member of a set
+		'SLAVEOF', // host port Make the server a slave of another instance, or promote it as master
+		'SLOWLOG', // subcommand [argument] Manages the Redis slow queries log
+		'SMEMBERS', // key Get all the members in a set
+		'SMOVE', // source destination member Move a member from one set to another
+		'SORT', // key [BY pattern] [LIMIT offset count] [GET pattern [GET pattern ...]] [ASC|DESC] [ALPHA] [STORE destination] Sort the elements in a list, set or sorted set
+		'SPOP', // key Remove and return a random member from a set
+		'SRANDMEMBER', // key [count] Get one or multiple random members from a set
+		'SREM', // key member [member ...] Remove one or more members from a set
+		'STRLEN', // key Get the length of the value stored in a key
+		'SUBSCRIBE', // channel [channel ...] Listen for messages published to the given channels
+		'SUNION', // key [key ...] Add multiple sets
+		'SUNIONSTORE', // destination key [key ...] Add multiple sets and store the resulting set in a key
+		'SYNC', // Internal command used for replication
+		'TIME', // Return the current server time
+		'TTL', // key Get the time to live for a key
+		'TYPE', // key Determine the type stored at key
+		'UNSUBSCRIBE', // [channel [channel ...]] Stop listening for messages posted to the given channels
+		'UNWATCH', // Forget about all watched keys
+		'WATCH', // key [key ...] Watch the given keys to determine execution of the MULTI/EXEC block
+		'ZADD', // key score member [score member ...] Add one or more members to a sorted set, or update its score if it already exists
+		'ZCARD', // key Get the number of members in a sorted set
+		'ZCOUNT', // key min max Count the members in a sorted set with scores within the given values
+		'ZINCRBY', // key increment member Increment the score of a member in a sorted set
+		'ZINTERSTORE', // destination numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX] Intersect multiple sorted sets and store the resulting sorted set in a new key
+		'ZRANGE', // key start stop [WITHSCORES] Return a range of members in a sorted set, by index
+		'ZRANGEBYSCORE', // key min max [WITHSCORES] [LIMIT offset count] Return a range of members in a sorted set, by score
+		'ZRANK', // key member Determine the index of a member in a sorted set
+		'ZREM', // key member [member ...] Remove one or more members from a sorted set
+		'ZREMRANGEBYRANK', // key start stop Remove all members in a sorted set within the given indexes
+		'ZREMRANGEBYSCORE', // key min max Remove all members in a sorted set within the given scores
+		'ZREVRANGE', // key start stop [WITHSCORES] Return a range of members in a sorted set, by index, with scores ordered from high to low
+		'ZREVRANGEBYSCORE', // key max min [WITHSCORES] [LIMIT offset count] Return a range of members in a sorted set, by score, with scores ordered from high to low
+		'ZREVRANK', // key member Determine the index of a member in a sorted set, with scores ordered from high to low
+		'ZSCORE', // key member Get the score associated with the given member in a sorted set
+		'ZUNIONSTORE', // destination numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX] Add multiple sorted sets and store the resulting sorted set in a new key
+	);
+	/**
+	 * @var Transaction the currently active transaction
+	 */
+	private $_transaction;
+	/**
+	 * @var resource redis socket connection
+	 */
+	private $_socket;
+
+	/**
+	 * Closes the connection when this component is being serialized.
+	 * @return array
+	 */
+	public function __sleep()
+	{
+		$this->close();
+		return array_keys(get_object_vars($this));
+	}
+
+	/**
+	 * Returns a value indicating whether the DB connection is established.
+	 * @return boolean whether the DB connection is established
+	 */
+	public function getIsActive()
+	{
+		return $this->_socket !== null;
+	}
+
+	/**
+	 * Establishes a DB connection.
+	 * It does nothing if a DB connection has already been established.
+	 * @throws Exception if connection fails
+	 */
+	public function open()
+	{
+		if ($this->_socket === null) {
+			if (empty($this->dsn)) {
+				throw new InvalidConfigException('Connection.dsn cannot be empty.');
+			}
+			$dsn = explode('/', $this->dsn);
+			$host = $dsn[2];
+			if (strpos($host, ':')===false) {
+				$host .= ':6379';
+			}
+			$db = isset($dsn[3]) ? $dsn[3] : 0;
+
+			\Yii::trace('Opening DB connection: ' . $this->dsn, __CLASS__);
+			$this->_socket = @stream_socket_client(
+				$host,
+				$errorNumber,
+				$errorDescription,
+				$this->timeout ? $this->timeout : ini_get("default_socket_timeout")
+			);
+			if ($this->_socket) {
+				if ($this->password !== null) {
+					$this->executeCommand('AUTH', array($this->password));
+				}
+				$this->executeCommand('SELECT', array($db));
+				$this->initConnection();
+			} else {
+				\Yii::error("Failed to open DB connection ({$this->dsn}): " . $errorNumber . ' - ' . $errorDescription, __CLASS__);
+				$message = YII_DEBUG ? 'Failed to open DB connection: ' . $errorNumber . ' - ' . $errorDescription : 'Failed to open DB connection.';
+				throw new Exception($message, $errorDescription, (int)$errorNumber);
+			}
+		}
+	}
+
+	/**
+	 * Closes the currently active DB connection.
+	 * It does nothing if the connection is already closed.
+	 */
+	public function close()
+	{
+		if ($this->_socket !== null) {
+			\Yii::trace('Closing DB connection: ' . $this->dsn, __CLASS__);
+			$this->executeCommand('QUIT');
+			stream_socket_shutdown($this->_socket, STREAM_SHUT_RDWR);
+			$this->_socket = null;
+			$this->_transaction = null;
+		}
+	}
+
+	/**
+	 * Initializes the DB connection.
+	 * This method is invoked right after the DB connection is established.
+	 * The default implementation triggers an [[EVENT_AFTER_OPEN]] event.
+	 */
+	protected function initConnection()
+	{
+		$this->trigger(self::EVENT_AFTER_OPEN);
+	}
+
+	/**
+	 * Returns the currently active transaction.
+	 * @return Transaction the currently active transaction. Null if no active transaction.
+	 */
+	public function getTransaction()
+	{
+		return $this->_transaction && $this->_transaction->isActive ? $this->_transaction : null;
+	}
+
+	/**
+	 * Starts a transaction.
+	 * @return Transaction the transaction initiated
+	 */
+	public function beginTransaction()
+	{
+		$this->open();
+		$this->_transaction = new Transaction(array(
+			'db' => $this,
+		));
+		$this->_transaction->begin();
+		return $this->_transaction;
+	}
+
+	/**
+	 * Returns the name of the DB driver for the current [[dsn]].
+	 * @return string name of the DB driver
+	 */
+	public function getDriverName()
+	{
+		if (($pos = strpos($this->dsn, ':')) !== false) {
+			return strtolower(substr($this->dsn, 0, $pos));
+		} else {
+			return 'redis';
+		}
+	}
+
+	/**
+	 *
+	 * @param string $name
+	 * @param array $params
+	 * @return mixed
+	 */
+	public function __call($name, $params)
+	{
+		$redisCommand = strtoupper(StringHelper::camel2words($name, false));
+		if (in_array($redisCommand, $this->redisCommands)) {
+			return $this->executeCommand($name, $params);
+		} else {
+			return parent::__call($name, $params);
+		}
+	}
+
+	/**
+	 * Executes a redis command.
+	 * For a list of available commands and their parameters see http://redis.io/commands.
+	 *
+	 * @param string $name the name of the command
+	 * @param array $params list of parameters for the command
+	 * @return array|bool|null|string Dependend on the executed command this method
+	 * will return different data types:
+	 *
+	 * - `true` for commands that return "status reply".
+	 * - `string` for commands that return "integer reply"
+	 *   as the value is in the range of a signed 64 bit integer.
+	 * - `string` or `null` for commands that return "bulk reply".
+	 * - `array` for commands that return "Multi-bulk replies".
+	 *
+	 * See [redis protocol description](http://redis.io/topics/protocol)
+	 * for details on the mentioned reply types.
+	 * @trows Exception for commands that return [error reply](http://redis.io/topics/protocol#error-reply).
+	 */
+	public function executeCommand($name, $params=array())
+	{
+		$this->open();
+
+		array_unshift($params, $name);
+		$command = '*' . count($params) . "\r\n";
+		foreach($params as $arg) {
+			$command .= '$' . strlen($arg) . "\r\n" . $arg . "\r\n";
+		}
+
+		\Yii::trace("Executing Redis Command: {$name}", __CLASS__);
+		fwrite($this->_socket, $command);
+
+		return $this->parseResponse(implode(' ', $params));
+	}
+
+	private function parseResponse($command)
+	{
+		if(($line = fgets($this->_socket))===false) {
+			throw new Exception("Failed to read from socket.\nRedis command was: " . $command);
+		}
+		$type = $line[0];
+		$line = substr($line, 1, -2);
+		switch($type)
+		{
+			case '+': // Status reply
+				return true;
+			case '-': // Error reply
+				throw new Exception("Redis error: " . $line . "\nRedis command was: " . $command);
+			case ':': // Integer reply
+				// no cast to int as it is in the range of a signed 64 bit integer
+				return $line;
+			case '$': // Bulk replies
+				if ($line == '-1') {
+					return null;
+				}
+				if(($data = fread($this->_socket, $line + 2))===false) {
+					throw new Exception("Failed to read from socket.\nRedis command was: " . $command);
+				}
+				return substr($data, 0, -2);
+			case '*': // Multi-bulk replies
+				$count = (int) $line;
+				$data = array();
+				for($i = 0; $i < $count; $i++) {
+					$data[] = $this->parseResponse($command);
+				}
+				return $data;
+			default:
+				throw new Exception('Received illegal data from redis: ' . $line . "\nRedis command was: " . $command);
+		}
+	}
+}
diff --git a/framework/yii/db/redis/Transaction.php b/framework/yii/db/redis/Transaction.php
new file mode 100644
index 0000000..721a7be
--- /dev/null
+++ b/framework/yii/db/redis/Transaction.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Transaction class file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright &copy; 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\db\redis;
+
+use yii\base\InvalidConfigException;
+use yii\db\Exception;
+
+/**
+ * Transaction represents a DB transaction.
+ *
+ * @property boolean $isActive Whether the transaction is active. This property is read-only.
+ *
+ * @since 2.0
+ */
+class Transaction extends \yii\base\Object
+{
+	/**
+	 * @var Connection the database connection that this transaction is associated with.
+	 */
+	public $db;
+	/**
+	 * @var boolean whether this transaction is active. Only an active transaction
+	 * can [[commit()]] or [[rollBack()]]. This property is set true when the transaction is started.
+	 */
+	private $_active = false;
+
+	/**
+	 * Returns a value indicating whether this transaction is active.
+	 * @return boolean whether this transaction is active. Only an active transaction
+	 * can [[commit()]] or [[rollBack()]].
+	 */
+	public function getIsActive()
+	{
+		return $this->_active;
+	}
+
+	/**
+	 * Begins a transaction.
+	 * @throws InvalidConfigException if [[connection]] is null
+	 */
+	public function begin()
+	{
+		if (!$this->_active) {
+			if ($this->db === null) {
+				throw new InvalidConfigException('Transaction::db must be set.');
+			}
+			\Yii::trace('Starting transaction', __CLASS__);
+			$this->db->open();
+			$this->db->createCommand('MULTI')->execute();
+			$this->_active = true;
+		}
+	}
+
+	/**
+	 * Commits a transaction.
+	 * @throws Exception if the transaction or the DB connection is not active.
+	 */
+	public function commit()
+	{
+		if ($this->_active && $this->db && $this->db->isActive) {
+			\Yii::trace('Committing transaction', __CLASS__);
+			$this->db->createCommand('EXEC')->execute();
+			// TODO handle result of EXEC
+			$this->_active = false;
+		} else {
+			throw new Exception('Failed to commit transaction: transaction was inactive.');
+		}
+	}
+
+	/**
+	 * Rolls back a transaction.
+	 * @throws Exception if the transaction or the DB connection is not active.
+	 */
+	public function rollback()
+	{
+		if ($this->_active && $this->db && $this->db->isActive) {
+			\Yii::trace('Rolling back transaction', __CLASS__);
+			$this->db->pdo->commit();
+			$this->_active = false;
+		} else {
+			throw new Exception('Failed to roll back transaction: transaction was inactive.');
+		}
+	}
+}
diff --git a/framework/yii/db/redis/schema.md b/framework/yii/db/redis/schema.md
new file mode 100644
index 0000000..1bd45b3
--- /dev/null
+++ b/framework/yii/db/redis/schema.md
@@ -0,0 +1,35 @@
+To allow AR to be stored in redis we need a special Schema for it.
+
+HSET prefix:className:primaryKey
+
+
+http://redis.io/commands
+
+Current Redis connection:
+https://github.com/jamm/Memory
+
+
+# Queries
+
+wrap all these in transactions MULTI
+
+## insert
+
+SET all attribute key-value pairs
+SET all relation key-value pairs
+make sure to create back-relations
+
+## update
+
+SET all attribute key-value pairs
+SET all relation key-value pairs
+
+
+## delete
+
+DEL all attribute key-value pairs
+DEL all relation key-value pairs
+make sure to update back-relations
+
+
+http://redis.io/commands/hmget sounds suiteable!
\ No newline at end of file
diff --git a/yii/caching/RedisCache.php b/yii/caching/RedisCache.php
deleted file mode 100644
index e988c2d..0000000
--- a/yii/caching/RedisCache.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-/**
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\caching;
-
-use yii\db\redis\Connection;
-
-/**
- * RedisCache implements a cache application component based on [redis](http://redis.io/).
- *
- * RedisCache needs to be configured with [[hostname]], [[port]] and [[database]] of the server
- * to connect to. By default RedisCache assumes there is a redis server running on localhost at
- * port 6379 and uses the database number 0.
- *
- * RedisCache also supports [the AUTH command](http://redis.io/commands/auth) of redis.
- * When the server needs authentication, you can set the [[password]] property to
- * authenticate with the server after connect.
- *
- * See [[Cache]] manual for common cache operations that RedisCache supports.
- * Unlike the [[CCache]], RedisCache allows the expire parameter of
- * [[set]] and [[add]] to be a floating point number, so you may specify the time in milliseconds.
- *
- * To use RedisCache as the cache application component, configure the application as follows,
- *
- * ~~~
- * array(
- *     'components'=>array(
- *         'cache'=>array(
- *             'class'=>'RedisCache',
- *             'hostname'=>'localhost',
- *             'port'=>6379,
- *             'database'=>0,
- *         ),
- *     ),
- * )
- * ~~~
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class RedisCache extends Cache
-{
-	/**
-	 * @var string hostname to use for connecting to the redis server. Defaults to 'localhost'.
-	 */
-	public $hostname = 'localhost';
-	/**
-	 * @var int the port to use for connecting to the redis server. Default port is 6379.
-	 */
-	public $port = 6379;
-	/**
-	 * @var string the password to use to authenticate with the redis server. If not set, no AUTH command will be sent.
-	 */
-	public $password;
-	/**
-	 * @var int the redis database to use. This is an integer value starting from 0. Defaults to 0.
-	 */
-	public $database = 0;
-	/**
-	 * @var float timeout to use for connection to redis. If not set the timeout set in php.ini will be used: ini_get("default_socket_timeout")
-	 */
-	public $timeout = null;
-	/**
-	 * @var \yii\db\redis\Connection the redis connection
-	 */
-	private $_connection;
-
-
-	/**
-	 * Initializes the cache component by establishing a connection to the redis server.
-	 */
-	public function init()
-	{
-		parent::init();
-		$this->getConnection();
-	}
-
-	/**
-	 * Returns the redis connection object.
-	 * Establishes a connection to the redis server if it does not already exists.
-	 *
-	 * TODO throw exception on error
-	 * @return \yii\db\redis\Connection
-	 */
-	public function getConnection()
-	{
-		if ($this->_connection === null) {
-			$this->_connection = new Connection(array(
-				'dsn' => 'redis://' . $this->hostname . ':' . $this->port . '/' . $this->database,
-				'password' => $this->password,
-				'timeout' => $this->timeout,
-			));
-		}
-		return $this->_connection;
-	}
-
-	/**
-	 * Retrieves a value from cache with a specified key.
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key a unique key identifying the cached value
-	 * @return string|boolean the value stored in cache, false if the value is not in the cache or expired.
-	 */
-	protected function getValue($key)
-	{
-		return $this->_connection->executeCommand('GET', array($key));
-	}
-
-	/**
-	 * Retrieves multiple values from cache with the specified keys.
-	 * @param array $keys a list of keys identifying the cached values
-	 * @return array a list of cached values indexed by the keys
-	 */
-	protected function getValues($keys)
-	{
-		$response = $this->_connection->executeCommand('MGET', $keys);
-		$result = array();
-		$i = 0;
-		foreach($keys as $key) {
-			$result[$key] = $response[$i++];
-		}
-		return $result;
-	}
-
-	/**
-	 * Stores a value identified by a key in cache.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param float $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * This can be a floating point number to specify the time in milliseconds.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function setValue($key,$value,$expire)
-	{
-		if ($expire == 0) {
-			return (bool) $this->_connection->executeCommand('SET', array($key, $value));
-		} else {
-			$expire = (int) ($expire * 1000);
-			return (bool) $this->_connection->executeCommand('PSETEX', array($key, $expire, $value));
-		}
-	}
-
-	/**
-	 * Stores a value identified by a key into cache if the cache does not contain this key.
-	 * This is the implementation of the method declared in the parent class.
-	 *
-	 * @param string $key the key identifying the value to be cached
-	 * @param string $value the value to be cached
-	 * @param float $expire the number of seconds in which the cached value will expire. 0 means never expire.
-	 * This can be a floating point number to specify the time in milliseconds.
-	 * @return boolean true if the value is successfully stored into cache, false otherwise
-	 */
-	protected function addValue($key,$value,$expire)
-	{
-		if ($expire == 0) {
-			return (bool) $this->_connection->executeCommand('SETNX', array($key, $value));
-		} else {
-			// TODO consider requiring redis version >= 2.6.12 that supports this in one command
-			$expire = (int) ($expire * 1000);
-			$this->_connection->executeCommand('MULTI');
-			$this->_connection->executeCommand('SETNX', array($key, $value));
-			$this->_connection->executeCommand('PEXPIRE', array($key, $expire));
-			$response = $this->_connection->executeCommand('EXEC');
-			return (bool) $response[0];
-		}
-	}
-
-	/**
-	 * Deletes a value with the specified key from cache
-	 * This is the implementation of the method declared in the parent class.
-	 * @param string $key the key of the value to be deleted
-	 * @return boolean if no error happens during deletion
-	 */
-	protected function deleteValue($key)
-	{
-		return (bool) $this->_connection->executeCommand('DEL', array($key));
-	}
-
-	/**
-	 * Deletes all values from cache.
-	 * This is the implementation of the method declared in the parent class.
-	 * @return boolean whether the flush operation was successful.
-	 */
-	protected function flushValues()
-	{
-		return $this->_connection->executeCommand('FLUSHDB');
-	}
-}
diff --git a/yii/db/redis/ActiveQuery.php b/yii/db/redis/ActiveQuery.php
deleted file mode 100644
index 1fbde46..0000000
--- a/yii/db/redis/ActiveQuery.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-/**
- * ActiveRecord class file.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\redis;
-
-/**
- * ActiveQuery represents a DB query associated with an Active Record class.
- *
- * ActiveQuery instances are usually created by [[yii\db\redis\ActiveRecord::find()]]
- * and [[yii\db\redis\ActiveRecord::count()]].
- *
- * ActiveQuery mainly provides the following methods to retrieve the query results:
- *
- * - [[one()]]: returns a single record populated with the first row of data.
- * - [[all()]]: returns all records based on the query results.
- * - [[count()]]: returns the number of records.
- * - [[sum()]]: returns the sum over the specified column.
- * - [[average()]]: returns the average over the specified column.
- * - [[min()]]: returns the min over the specified column.
- * - [[max()]]: returns the max over the specified column.
- * - [[scalar()]]: returns the value of the first column in the first row of the query result.
- * - [[exists()]]: returns a value indicating whether the query result has data or not.
- *
- * You can use query methods, such as [[limit()]], [[orderBy()]] to customize the query options.
- *
- * ActiveQuery also provides the following additional query options:
- *
- * - [[with()]]: list of relations that this query should be performed with.
- * - [[indexBy()]]: the name of the column by which the query result should be indexed.
- * - [[asArray()]]: whether to return each record as an array.
- *
- * These options can be configured using methods of the same name. For example:
- *
- * ~~~
- * $customers = Customer::find()->with('orders')->asArray()->all();
- * ~~~
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class ActiveQuery extends \yii\base\Component
-{
-	/**
-	 * @var string the name of the ActiveRecord class.
-	 */
-	public $modelClass;
-	/**
-	 * @var array list of relations that this query should be performed with
-	 */
-	public $with;
-	/**
-	 * @var string the name of the column by which query results should be indexed by.
-	 * This is only used when the query result is returned as an array when calling [[all()]].
-	 */
-	public $indexBy;
-	/**
-	 * @var boolean whether to return each record as an array. If false (default), an object
-	 * of [[modelClass]] will be created to represent each record.
-	 */
-	public $asArray;
-	/**
-	 * @var integer maximum number of records to be returned. If not set or less than 0, it means no limit.
-	 */
-	public $limit;
-	/**
-	 * @var integer zero-based offset from where the records are to be returned.
-	 * If not set, it means starting from the beginning.
-	 * If less than zero it means starting n elements from the end.
-	 */
-	public $offset;
-	/**
-	 * @var array array of primary keys of the records to find.
-	 */
-	public $primaryKeys;
-
-	/**
-	 * List of multiple pks must be zero based
-	 *
-	 * @param $primaryKeys
-	 * @return ActiveQuery
-	 */
-	public function primaryKeys($primaryKeys) {
-		if (is_array($primaryKeys) && isset($primaryKeys[0])) {
-			$this->primaryKeys = $primaryKeys;
-		} else {
-			$this->primaryKeys = array($primaryKeys);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Executes query and returns all results as an array.
-	 * @return array the query results. If the query results in nothing, an empty array will be returned.
-	 */
-	public function all()
-	{
-		$modelClass = $this->modelClass;
-		/** @var Connection $db */
-		$db = $modelClass::getDb();
-		if (($primaryKeys = $this->primaryKeys) === null) {
-			$start = $this->offset === null ? 0 : $this->offset;
-			$end = $this->limit === null ? -1 : $start + $this->limit;
-			$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $end));
-		}
-		$rows = array();
-		foreach($primaryKeys as $pk) {
-			$key = $modelClass::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
-			// get attributes
-			$data = $db->executeCommand('HGETALL', array($key));
-			$row = array();
-			for($i=0;$i<count($data);) {
-				$row[$data[$i++]] = $data[$i++];
-			}
-			$rows[] = $row;
-		}
-		if ($rows !== array()) {
-			$models = $this->createModels($rows);
-			if (!empty($this->with)) {
-				$this->populateRelations($models, $this->with);
-			}
-			return $models;
-		} else {
-			return array();
-		}
-	}
-
-	/**
-	 * Executes query and returns a single row of result.
-	 * @return ActiveRecord|array|null a single row of query result. Depending on the setting of [[asArray]],
-	 * the query result may be either an array or an ActiveRecord object. Null will be returned
-	 * if the query results in nothing.
-	 */
-	public function one()
-	{
-		$modelClass = $this->modelClass;
-		/** @var Connection $db */
-		$db = $modelClass::getDb();
-		if (($primaryKeys = $this->primaryKeys) === null) {
-			$start = $this->offset === null ? 0 : $this->offset;
-			$primaryKeys = $db->executeCommand('LRANGE', array($modelClass::tableName(), $start, $start + 1));
-		}
-		$pk = reset($primaryKeys);
-		$key = $modelClass::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
-		// get attributes
-		$data = $db->executeCommand('HGETALL', array($key));
-		if ($data === array()) {
-			return null;
-		}
-		$row = array();
-		for($i=0;$i<count($data);) {
-			$row[$data[$i++]] = $data[$i++];
-		}
-		if (!$this->asArray) {
-			/** @var $class ActiveRecord */
-			$class = $this->modelClass;
-			$model = $class::create($row);
-			if (!empty($this->with)) {
-				$models = array($model);
-				$this->populateRelations($models, $this->with);
-				$model = $models[0];
-			}
-			return $model;
-		} else {
-			return $row;
-		}
-	}
-
-	/**
-	 * Returns the number of records.
-	 * @param string $q the COUNT expression. Defaults to '*'.
-	 * Make sure you properly quote column names.
-	 * @return integer number of records
-	 */
-	public function count()
-	{
-		$modelClass = $this->modelClass;
-		/** @var Connection $db */
-		$db = $modelClass::getDb();
-		return $db->executeCommand('LLEN', array($modelClass::tableName()));
-	}
-
-	/**
-	 * Returns the query result as a scalar value.
-	 * The value returned will be the first column in the first row of the query results.
-	 * @return string|boolean the value of the first column in the first row of the query result.
-	 * False is returned if the query result is empty.
-	 */
-	public function scalar($column)
-	{
-		$record = $this->one();
-		return $record->$column;
-	}
-
-	/**
-	 * Returns a value indicating whether the query result contains any row of data.
-	 * @return boolean whether the query result contains any row of data.
-	 */
-	public function exists()
-	{
-		return $this->one() !== null;
-	}
-
-
-	/**
-	 * Sets the [[asArray]] property.
-	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	 * @param boolean $value whether to return the query results in terms of arrays instead of Active Records.
-	 * @return ActiveQuery the query object itself
-	 */
-	public function asArray($value = true)
-	{
-		$this->asArray = $value;
-		return $this;
-	}
-
-	/**
-	 * Sets the LIMIT part of the query.
-	 * TODO: refactor, it is duplicated from yii/db/Query
-	 * @param integer $limit the limit
-	 * @return Query the query object itself
-	 */
-	public function limit($limit)
-	{
-		$this->limit = $limit;
-		return $this;
-	}
-
-	/**
-	 * Sets the OFFSET part of the query.
-	 * TODO: refactor, it is duplicated from yii/db/Query
-	 * @param integer $offset the offset
-	 * @return Query the query object itself
-	 */
-	public function offset($offset)
-	{
-		$this->offset = $offset;
-		return $this;
-	}
-
-	/**
-	 * Specifies the relations with which this query should be performed.
-	 *
-	 * The parameters to this method can be either one or multiple strings, or a single array
-	 * of relation names and the optional callbacks to customize the relations.
-	 *
-	 * The followings are some usage examples:
-	 *
-	 * ~~~
-	 * // find customers together with their orders and country
-	 * Customer::find()->with('orders', 'country')->all();
-	 * // find customers together with their country and orders of status 1
-	 * Customer::find()->with(array(
-	 *     'orders' => function($query) {
-	 *         $query->andWhere('status = 1');
-	 *     },
-	 *     'country',
-	 * ))->all();
-	 * ~~~
-	 *
-	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	 * @return ActiveQuery the query object itself
-	 */
-	public function with()
-	{
-		$this->with = func_get_args();
-		if (isset($this->with[0]) && is_array($this->with[0])) {
-			// the parameter is given as an array
-			$this->with = $this->with[0];
-		}
-		return $this;
-	}
-
-	/**
-	 * Sets the [[indexBy]] property.
-	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	 * @param string $column the name of the column by which the query results should be indexed by.
-	 * @return ActiveQuery the query object itself
-	 */
-	public function indexBy($column)
-	{
-		$this->indexBy = $column;
-		return $this;
-	}
-
-	// TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	private function createModels($rows)
-	{
-		$models = array();
-		if ($this->asArray) {
-			if ($this->indexBy === null) {
-				return $rows;
-			}
-			foreach ($rows as $row) {
-				$models[$row[$this->indexBy]] = $row;
-			}
-		} else {
-			/** @var $class ActiveRecord */
-			$class = $this->modelClass;
-			if ($this->indexBy === null) {
-				foreach ($rows as $row) {
-					$models[] = $class::create($row);
-				}
-			} else {
-				foreach ($rows as $row) {
-					$model = $class::create($row);
-					$models[$model->{$this->indexBy}] = $model;
-				}
-			}
-		}
-		return $models;
-	}
-
-	// TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	private function populateRelations(&$models, $with)
-	{
-		$primaryModel = new $this->modelClass;
-		$relations = $this->normalizeRelations($primaryModel, $with);
-		foreach ($relations as $name => $relation) {
-			if ($relation->asArray === null) {
-				// inherit asArray from primary query
-				$relation->asArray = $this->asArray;
-			}
-			$relation->findWith($name, $models);
-		}
-	}
-
-	/**
-	 * TODO: refactor, it is duplicated from yii/db/ActiveQuery
-	 * @param ActiveRecord $model
-	 * @param array $with
-	 * @return ActiveRelation[]
-	 */
-	private function normalizeRelations($model, $with)
-	{
-		$relations = array();
-		foreach ($with as $name => $callback) {
-			if (is_integer($name)) {
-				$name = $callback;
-				$callback = null;
-			}
-			if (($pos = strpos($name, '.')) !== false) {
-				// with sub-relations
-				$childName = substr($name, $pos + 1);
-				$name = substr($name, 0, $pos);
-			} else {
-				$childName = null;
-			}
-
-			$t = strtolower($name);
-			if (!isset($relations[$t])) {
-				$relation = $model->getRelation($name);
-				$relation->primaryModel = null;
-				$relations[$t] = $relation;
-			} else {
-				$relation = $relations[$t];
-			}
-
-			if (isset($childName)) {
-				$relation->with[$childName] = $callback;
-			} elseif ($callback !== null) {
-				call_user_func($callback, $relation);
-			}
-		}
-		return $relations;
-	}
-}
diff --git a/yii/db/redis/ActiveRecord.php b/yii/db/redis/ActiveRecord.php
deleted file mode 100644
index 4c495e1..0000000
--- a/yii/db/redis/ActiveRecord.php
+++ /dev/null
@@ -1,563 +0,0 @@
-<?php
-/**
- * ActiveRecord class file.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\redis;
-
-use yii\base\InvalidConfigException;
-use yii\base\InvalidParamException;
-use yii\base\NotSupportedException;
-use yii\base\UnknownMethodException;
-use yii\db\TableSchema;
-
-/**
- * ActiveRecord is the base class for classes representing relational data in terms of objects.
- *
- * @include @yii/db/ActiveRecord.md
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-abstract class ActiveRecord extends \yii\db\ActiveRecord
-{
-	/**
-	 * Returns the database connection used by this AR class.
-	 * By default, the "redis" application component is used as the database connection.
-	 * You may override this method if you want to use a different database connection.
-	 * @return Connection the database connection used by this AR class.
-	 */
-	public static function getDb()
-	{
-		return \Yii::$app->redis;
-	}
-
-	/**
-	 * Creates an [[ActiveQuery]] instance for query purpose.
-	 *
-	 * @include @yii/db/ActiveRecord-find.md
-	 *
-	 * @param mixed $q the query parameter. This can be one of the followings:
-	 *
-	 *  - a scalar value (integer or string): query by a single primary key value and return the
-	 *    corresponding record.
-	 *  - an array of name-value pairs: query by a set of column values and return a single record matching all of them.
-	 *  - null: return a new [[ActiveQuery]] object for further query purpose.
-	 *
-	 * @return ActiveQuery|ActiveRecord|null When `$q` is null, a new [[ActiveQuery]] instance
-	 * is returned; when `$q` is a scalar or an array, an ActiveRecord object matching it will be
-	 * returned (null will be returned if there is no matching).
-	 * @see createQuery()
-	 */
-	public static function find($q = null) // TODO optimize API
-	{
-		$query = static::createQuery();
-		if (is_array($q)) {
-			return $query->primaryKeys($q)->one();
-		} elseif ($q !== null) {
-			// query by primary key
-			$primaryKey = static::primaryKey();
-			return $query->primaryKeys(array($primaryKey[0] => $q))->one();
-		}
-		return $query;
-	}
-
-	/**
-	 * Creates an [[ActiveQuery]] instance with a given SQL statement.
-	 *
-	 * Note that because the SQL statement is already specified, calling additional
-	 * query modification methods (such as `where()`, `order()`) on the created [[ActiveQuery]]
-	 * instance will have no effect. However, calling `with()`, `asArray()` or `indexBy()` is
-	 * still fine.
-	 *
-	 * Below is an example:
-	 *
-	 * ~~~
-	 * $customers = Customer::findBySql('SELECT * FROM tbl_customer')->all();
-	 * ~~~
-	 *
-	 * @param string $sql the SQL statement to be executed
-	 * @param array $params parameters to be bound to the SQL statement during execution.
-	 * @return ActiveQuery the newly created [[ActiveQuery]] instance
-	 */
-	public static function findBySql($sql, $params = array())
-	{
-		throw new NotSupportedException('findBySql() is not supported by redis ActiveRecord');
-	}
-
-
-
-	/**
-	 * Creates an [[ActiveQuery]] instance.
-	 * This method is called by [[find()]], [[findBySql()]] and [[count()]] to start a SELECT query.
-	 * You may override this method to return a customized query (e.g. `CustomerQuery` specified
-	 * written for querying `Customer` purpose.)
-	 * @return ActiveQuery the newly created [[ActiveQuery]] instance.
-	 */
-	public static function createQuery()
-	{
-		return new ActiveQuery(array(
-			'modelClass' => get_called_class(),
-		));
-	}
-
-
-	/**
-	 * Returns the schema information of the DB table associated with this AR class.
-	 * @return TableSchema the schema information of the DB table associated with this AR class.
-	 */
-	public static function getTableSchema()
-	{
-		throw new InvalidConfigException(__CLASS__.'::getTableSchema() needs to be overridden in subclasses and return a TableSchema.');
-	}
-
-	/**
-	 * Inserts a row into the associated database table using the attribute values of this record.
-	 *
-	 * This method performs the following steps in order:
-	 *
-	 * 1. call [[beforeValidate()]] when `$runValidation` is true. If validation
-	 *    fails, it will skip the rest of the steps;
-	 * 2. call [[afterValidate()]] when `$runValidation` is true.
-	 * 3. call [[beforeSave()]]. If the method returns false, it will skip the
-	 *    rest of the steps;
-	 * 4. insert the record into database. If this fails, it will skip the rest of the steps;
-	 * 5. call [[afterSave()]];
-	 *
-	 * In the above step 1, 2, 3 and 5, events [[EVENT_BEFORE_VALIDATE]],
-	 * [[EVENT_BEFORE_INSERT]], [[EVENT_AFTER_INSERT]] and [[EVENT_AFTER_VALIDATE]]
-	 * will be raised by the corresponding methods.
-	 *
-	 * Only the [[changedAttributes|changed attribute values]] will be inserted into database.
-	 *
-	 * If the table's primary key is auto-incremental and is null during insertion,
-	 * it will be populated with the actual value after insertion.
-	 *
-	 * For example, to insert a customer record:
-	 *
-	 * ~~~
-	 * $customer = new Customer;
-	 * $customer->name = $name;
-	 * $customer->email = $email;
-	 * $customer->insert();
-	 * ~~~
-	 *
-	 * @param boolean $runValidation whether to perform validation before saving the record.
-	 * If the validation fails, the record will not be inserted into the database.
-	 * @param array $attributes list of attributes that need to be saved. Defaults to null,
-	 * meaning all attributes that are loaded from DB will be saved.
-	 * @return boolean whether the attributes are valid and the record is inserted successfully.
-	 */
-	public function insert($runValidation = true, $attributes = null)
-	{
-		if ($runValidation && !$this->validate($attributes)) {
-			return false;
-		}
-		if ($this->beforeSave(true)) {
-			$db = static::getDb();
-			$values = $this->getDirtyAttributes($attributes);
-			$pk = array();
-//			if ($values === array()) {
-				foreach ($this->primaryKey() as $key) {
-					$pk[$key] = $values[$key] = $this->getAttribute($key);
-					if ($pk[$key] === null) {
-						$pk[$key] = $values[$key] = $db->executeCommand('INCR', array(static::tableName() . ':s:' . $key));
-						$this->setAttribute($key, $values[$key]);
-					}
-				}
-//			}
-			// save pk in a findall pool
-			$db->executeCommand('RPUSH', array(static::tableName(), implode('-', $pk))); // TODO escape PK glue
-
-			$key = static::tableName() . ':a:' . implode('-', $pk); // TODO escape PK glue
-			// save attributes
-			$args = array($key);
-			foreach($values as $attribute => $value) {
-				$args[] = $attribute;
-				$args[] = $value;
-			}
-			$db->executeCommand('HMSET', $args);
-
-			$this->setOldAttributes($values);
-			$this->afterSave(true);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Updates the whole table using the provided attribute values and conditions.
-	 * For example, to change the status to be 1 for all customers whose status is 2:
-	 *
-	 * ~~~
-	 * Customer::updateAll(array('status' => 1), 'status = 2');
-	 * ~~~
-	 *
-	 * @param array $attributes attribute values (name-value pairs) to be saved into the table
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return integer the number of rows updated
-	 */
-	public static function updateAll($attributes, $condition = '', $params = array())
-	{
-		$db = static::getDb();
-		if ($condition==='') {
-			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
-		}
-		if (empty($attributes)) {
-			return 0;
-		}
-		$n=0;
-		foreach($condition as $pk) {
-			$key = static::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
-			// save attributes
-			$args = array($key);
-			foreach($attributes as $attribute => $value) {
-				$args[] = $attribute;
-				$args[] = $value;
-			}
-			$db->executeCommand('HMSET', $args);
-			$n++;
-		}
-
-		return $n;
-	}
-
-	/**
-	 * Updates the whole table using the provided counter changes and conditions.
-	 * For example, to increment all customers' age by 1,
-	 *
-	 * ~~~
-	 * Customer::updateAllCounters(array('age' => 1));
-	 * ~~~
-	 *
-	 * @param array $counters the counters to be updated (attribute name => increment value).
-	 * Use negative values if you want to decrement the counters.
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the UPDATE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * Do not name the parameters as `:bp0`, `:bp1`, etc., because they are used internally by this method.
-	 * @return integer the number of rows updated
-	 */
-	public static function updateAllCounters($counters, $condition = '', $params = array())
-	{
-		if (is_array($condition) && !isset($condition[0])) { // TODO do this in all *All methods
-			$condition = array($condition);
-		}
-		$db = static::getDb();
-		if ($condition==='') {
-			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
-		}
-		$n=0;
-		foreach($condition as $pk) { // TODO allow multiple pks as condition
-			$key = static::tableName() . ':a:' . (is_array($pk) ? implode('-', $pk) : $pk); // TODO escape PK glue
-			foreach($counters as $attribute => $value) {
-				$db->executeCommand('HINCRBY', array($key, $attribute, $value));
-			}
-			$n++;
-		}
-		return $n;
-	}
-
-	/**
-	 * Deletes rows in the table using the provided conditions.
-	 * WARNING: If you do not specify any condition, this method will delete ALL rows in the table.
-	 *
-	 * For example, to delete all customers whose status is 3:
-	 *
-	 * ~~~
-	 * Customer::deleteAll('status = 3');
-	 * ~~~
-	 *
-	 * @param string|array $condition the conditions that will be put in the WHERE part of the DELETE SQL.
-	 * Please refer to [[Query::where()]] on how to specify this parameter.
-	 * @param array $params the parameters (name=>value) to be bound to the query.
-	 * @return integer the number of rows deleted
-	 */
-	public static function deleteAll($condition = '', $params = array())
-	{
-		$db = static::getDb();
-		if ($condition==='') {
-			$condition = $db->executeCommand('LRANGE', array(static::tableName(), 0, -1));
-		}
-		if (empty($condition)) {
-			return 0;
-		}
-		$attributeKeys = array();
-		foreach($condition as $pk) {
-			if (is_array($pk)) {
-				$pk = implode('-', $pk);
-			}
-			$db->executeCommand('LREM', array(static::tableName(), 0, $pk)); // TODO escape PK glue
-			$attributeKeys[] = static::tableName() . ':a:' . $pk; // TODO escape PK glue
-		}
-		return $db->executeCommand('DEL', $attributeKeys);
-	}
-
-	/**
-	 * Declares a `has-one` relation.
-	 * The declaration is returned in terms of an [[ActiveRelation]] instance
-	 * through which the related record can be queried and retrieved back.
-	 *
-	 * A `has-one` relation means that there is at most one related record matching
-	 * the criteria set by this relation, e.g., a customer has one country.
-	 *
-	 * For example, to declare the `country` relation for `Customer` class, we can write
-	 * the following code in the `Customer` class:
-	 *
-	 * ~~~
-	 * public function getCountry()
-	 * {
-	 *     return $this->hasOne('Country', array('id' => 'country_id'));
-	 * }
-	 * ~~~
-	 *
-	 * Note that in the above, the 'id' key in the `$link` parameter refers to an attribute name
-	 * in the related class `Country`, while the 'country_id' value refers to an attribute name
-	 * in the current AR class.
-	 *
-	 * Call methods declared in [[ActiveRelation]] to further customize the relation.
-	 *
-	 * @param string $class the class name of the related record
-	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
-	 * the columns in the table associated with the `$class` model, while the values of the
-	 * array refer to the corresponding columns in the table associated with this AR class.
-	 * @return ActiveRelation the relation object.
-	 */
-	public function hasOne($class, $link)
-	{
-		return new ActiveRelation(array(
-			'modelClass' => $this->getNamespacedClass($class),
-			'primaryModel' => $this,
-			'link' => $link,
-			'multiple' => false,
-		));
-	}
-
-	/**
-	 * Declares a `has-many` relation.
-	 * The declaration is returned in terms of an [[ActiveRelation]] instance
-	 * through which the related record can be queried and retrieved back.
-	 *
-	 * A `has-many` relation means that there are multiple related records matching
-	 * the criteria set by this relation, e.g., a customer has many orders.
-	 *
-	 * For example, to declare the `orders` relation for `Customer` class, we can write
-	 * the following code in the `Customer` class:
-	 *
-	 * ~~~
-	 * public function getOrders()
-	 * {
-	 *     return $this->hasMany('Order', array('customer_id' => 'id'));
-	 * }
-	 * ~~~
-	 *
-	 * Note that in the above, the 'customer_id' key in the `$link` parameter refers to
-	 * an attribute name in the related class `Order`, while the 'id' value refers to
-	 * an attribute name in the current AR class.
-	 *
-	 * @param string $class the class name of the related record
-	 * @param array $link the primary-foreign key constraint. The keys of the array refer to
-	 * the columns in the table associated with the `$class` model, while the values of the
-	 * array refer to the corresponding columns in the table associated with this AR class.
-	 * @return ActiveRelation the relation object.
-	 */
-	public function hasMany($class, $link)
-	{
-		return new ActiveRelation(array(
-			'modelClass' => $this->getNamespacedClass($class),
-			'primaryModel' => $this,
-			'link' => $link,
-			'multiple' => true,
-		));
-	}
-
-	/**
-	 * Returns the relation object with the specified name.
-	 * A relation is defined by a getter method which returns an [[ActiveRelation]] object.
-	 * It can be declared in either the Active Record class itself or one of its behaviors.
-	 * @param string $name the relation name
-	 * @return ActiveRelation the relation object
-	 * @throws InvalidParamException if the named relation does not exist.
-	 */
-	public function getRelation($name)
-	{
-		$getter = 'get' . $name;
-		try {
-			$relation = $this->$getter();
-			if ($relation instanceof ActiveRelation) {
-				return $relation;
-			}
-		} catch (UnknownMethodException $e) {
-		}
-		throw new InvalidParamException(get_class($this) . ' has no relation named "' . $name . '".');
-	}
-
-	/**
-	 * Establishes the relationship between two models.
-	 *
-	 * The relationship is established by setting the foreign key value(s) in one model
-	 * to be the corresponding primary key value(s) in the other model.
-	 * The model with the foreign key will be saved into database without performing validation.
-	 *
-	 * If the relationship involves a pivot table, a new row will be inserted into the
-	 * pivot table which contains the primary key values from both models.
-	 *
-	 * Note that this method requires that the primary key value is not null.
-	 *
-	 * @param string $name the name of the relationship
-	 * @param ActiveRecord $model the model to be linked with the current one.
-	 * @param array $extraColumns additional column values to be saved into the pivot table.
-	 * This parameter is only meaningful for a relationship involving a pivot table
-	 * (i.e., a relation set with `[[ActiveRelation::via()]]` or `[[ActiveRelation::viaTable()]]`.)
-	 * @throws InvalidCallException if the method is unable to link two models.
-	 */
-	public function link($name, $model, $extraColumns = array())
-	{
-		// TODO
-		$relation = $this->getRelation($name);
-
-		if ($relation->via !== null) {
-			if (is_array($relation->via)) {
-				/** @var $viaRelation ActiveRelation */
-				list($viaName, $viaRelation) = $relation->via;
-				/** @var $viaClass ActiveRecord */
-				$viaClass = $viaRelation->modelClass;
-				$viaTable = $viaClass::tableName();
-				// unset $viaName so that it can be reloaded to reflect the change
-				unset($this->_related[strtolower($viaName)]);
-			} else {
-				$viaRelation = $relation->via;
-				$viaTable = reset($relation->via->from);
-			}
-			$columns = array();
-			foreach ($viaRelation->link as $a => $b) {
-				$columns[$a] = $this->$b;
-			}
-			foreach ($relation->link as $a => $b) {
-				$columns[$b] = $model->$a;
-			}
-			foreach ($extraColumns as $k => $v) {
-				$columns[$k] = $v;
-			}
-			static::getDb()->createCommand()
-				->insert($viaTable, $columns)->execute();
-		} else {
-			$p1 = $model->isPrimaryKey(array_keys($relation->link));
-			$p2 = $this->isPrimaryKey(array_values($relation->link));
-			if ($p1 && $p2) {
-				if ($this->getIsNewRecord() && $model->getIsNewRecord()) {
-					throw new InvalidCallException('Unable to link models: both models are newly created.');
-				} elseif ($this->getIsNewRecord()) {
-					$this->bindModels(array_flip($relation->link), $this, $model);
-				} else {
-					$this->bindModels($relation->link, $model, $this);
-				}
-			} elseif ($p1) {
-				$this->bindModels(array_flip($relation->link), $this, $model);
-			} elseif ($p2) {
-				$this->bindModels($relation->link, $model, $this);
-			} else {
-				throw new InvalidCallException('Unable to link models: the link does not involve any primary key.');
-			}
-		}
-
-		// update lazily loaded related objects
-		if (!$relation->multiple) {
-			$this->_related[$name] = $model;
-		} elseif (isset($this->_related[$name])) {
-			if ($relation->indexBy !== null) {
-				$indexBy = $relation->indexBy;
-				$this->_related[$name][$model->$indexBy] = $model;
-			} else {
-				$this->_related[$name][] = $model;
-			}
-		}
-	}
-
-	/**
-	 * Destroys the relationship between two models.
-	 *
-	 * The model with the foreign key of the relationship will be deleted if `$delete` is true.
-	 * Otherwise, the foreign key will be set null and the model will be saved without validation.
-	 *
-	 * @param string $name the name of the relationship.
-	 * @param ActiveRecord $model the model to be unlinked from the current one.
-	 * @param boolean $delete whether to delete the model that contains the foreign key.
-	 * If false, the model's foreign key will be set null and saved.
-	 * If true, the model containing the foreign key will be deleted.
-	 * @throws InvalidCallException if the models cannot be unlinked
-	 */
-	public function unlink($name, $model, $delete = false)
-	{
-		// TODO
-		$relation = $this->getRelation($name);
-
-		if ($relation->via !== null) {
-			if (is_array($relation->via)) {
-				/** @var $viaRelation ActiveRelation */
-				list($viaName, $viaRelation) = $relation->via;
-				/** @var $viaClass ActiveRecord */
-				$viaClass = $viaRelation->modelClass;
-				$viaTable = $viaClass::tableName();
-				unset($this->_related[strtolower($viaName)]);
-			} else {
-				$viaRelation = $relation->via;
-				$viaTable = reset($relation->via->from);
-			}
-			$columns = array();
-			foreach ($viaRelation->link as $a => $b) {
-				$columns[$a] = $this->$b;
-			}
-			foreach ($relation->link as $a => $b) {
-				$columns[$b] = $model->$a;
-			}
-			$command = static::getDb()->createCommand();
-			if ($delete) {
-				$command->delete($viaTable, $columns)->execute();
-			} else {
-				$nulls = array();
-				foreach (array_keys($columns) as $a) {
-					$nulls[$a] = null;
-				}
-				$command->update($viaTable, $nulls, $columns)->execute();
-			}
-		} else {
-			$p1 = $model->isPrimaryKey(array_keys($relation->link));
-			$p2 = $this->isPrimaryKey(array_values($relation->link));
-			if ($p1 && $p2 || $p2) {
-				foreach ($relation->link as $a => $b) {
-					$model->$a = null;
-				}
-				$delete ? $model->delete() : $model->save(false);
-			} elseif ($p1) {
-				foreach ($relation->link as $b) {
-					$this->$b = null;
-				}
-				$delete ? $this->delete() : $this->save(false);
-			} else {
-				throw new InvalidCallException('Unable to unlink models: the link does not involve any primary key.');
-			}
-		}
-
-		if (!$relation->multiple) {
-			unset($this->_related[$name]);
-		} elseif (isset($this->_related[$name])) {
-			/** @var $b ActiveRecord */
-			foreach ($this->_related[$name] as $a => $b) {
-				if ($model->getPrimaryKey() == $b->getPrimaryKey()) {
-					unset($this->_related[$name][$a]);
-				}
-			}
-		}
-	}
-
-
-	// TODO implement link and unlink
-}
diff --git a/yii/db/redis/ActiveRelation.php b/yii/db/redis/ActiveRelation.php
deleted file mode 100644
index e01f3a4..0000000
--- a/yii/db/redis/ActiveRelation.php
+++ /dev/null
@@ -1,249 +0,0 @@
-<?php
-/**
- * ActiveRecord class file.
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\redis;
-
-use yii\base\NotSupportedException;
-
-/**
- * ActiveRecord is the base class for classes representing relational data in terms of objects.
- *
- *
- * @author Carsten Brandt <mail@cebe.cc>
- * @since 2.0
- */
-class ActiveRelation extends \yii\db\redis\ActiveQuery
-{
-	/**
-	 * @var boolean whether this relation should populate all query results into AR instances.
-	 * If false, only the first row of the results will be retrieved.
-	 */
-	public $multiple;
-	/**
-	 * @var ActiveRecord the primary model that this relation is associated with.
-	 * This is used only in lazy loading with dynamic query options.
-	 */
-	public $primaryModel;
-	/**
-	 * @var array the columns of the primary and foreign tables that establish the relation.
-	 * The array keys must be columns of the table for this relation, and the array values
-	 * must be the corresponding columns from the primary table.
-	 * Do not prefix or quote the column names as this will be done automatically by Yii.
-	 */
-	public $link;
-	/**
-	 * @var array|ActiveRelation the query associated with the pivot table. Please call [[via()]]
-	 * or [[viaTable()]] to set this property instead of directly setting it.
-	 */
-	public $via;
-
-	/**
-	 * Specifies the relation associated with the pivot table.
-	 * @param string $relationName the relation name. This refers to a relation declared in [[primaryModel]].
-	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
-	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
-	 * @return ActiveRelation the relation object itself.
-	 */
-	public function via($relationName, $callable = null)
-	{
-		$relation = $this->primaryModel->getRelation($relationName);
-		$this->via = array($relationName, $relation);
-		if ($callable !== null) {
-			call_user_func($callable, $relation);
-		}
-		return $this;
-	}
-
-	/**
-	 * Specifies the pivot table.
-	 * @param string $tableName the name of the pivot table.
-	 * @param array $link the link between the pivot table and the table associated with [[primaryModel]].
-	 * The keys of the array represent the columns in the pivot table, and the values represent the columns
-	 * in the [[primaryModel]] table.
-	 * @param callable $callable a PHP callback for customizing the relation associated with the pivot table.
-	 * Its signature should be `function($query)`, where `$query` is the query to be customized.
-	 * @return ActiveRelation
-	 * /
-	public function viaTable($tableName, $link, $callable = null)
-	{
-		$relation = new ActiveRelation(array(
-			'modelClass' => get_class($this->primaryModel),
-			'from' => array($tableName),
-			'link' => $link,
-			'multiple' => true,
-			'asArray' => true,
-		));
-		$this->via = $relation;
-		if ($callable !== null) {
-			call_user_func($callable, $relation);
-		}
-		return $this;
-	}*/
-
-	/**
-	 * Finds the related records and populates them into the primary models.
-	 * This method is internally by [[ActiveQuery]]. Do not call it directly.
-	 * @param string $name the relation name
-	 * @param array $primaryModels primary models
-	 * @return array the related models
-	 * @throws InvalidConfigException
-	 */
-	public function findWith($name, &$primaryModels)
-	{
-		if (!is_array($this->link)) {
-			throw new InvalidConfigException('Invalid link: it must be an array of key-value pairs.');
-		}
-
-		if ($this->via instanceof self) {
-			// TODO
-			// via pivot table
-			/** @var $viaQuery ActiveRelation */
-			$viaQuery = $this->via;
-			$viaModels = $viaQuery->findPivotRows($primaryModels);
-			$this->filterByModels($viaModels);
-		} elseif (is_array($this->via)) {
-			// TODO
-			// via relation
-			/** @var $viaQuery ActiveRelation */
-			list($viaName, $viaQuery) = $this->via;
-			$viaQuery->primaryModel = null;
-			$viaModels = $viaQuery->findWith($viaName, $primaryModels);
-			$this->filterByModels($viaModels);
-		} else {
-			$this->filterByModels($primaryModels);
-		}
-
-		if (count($primaryModels) === 1 && !$this->multiple) {
-			$model = $this->one();
-			foreach ($primaryModels as $i => $primaryModel) {
-				if ($primaryModel instanceof ActiveRecord) {
-					$primaryModel->populateRelation($name, $model);
-				} else {
-					$primaryModels[$i][$name] = $model;
-				}
-			}
-			return array($model);
-		} else {
-			$models = $this->all();
-			if (isset($viaModels, $viaQuery)) {
-				$buckets = $this->buildBuckets($models, $this->link, $viaModels, $viaQuery->link);
-			} else {
-				$buckets = $this->buildBuckets($models, $this->link);
-			}
-
-			$link = array_values(isset($viaQuery) ? $viaQuery->link : $this->link);
-			foreach ($primaryModels as $i => $primaryModel) {
-				$key = $this->getModelKey($primaryModel, $link);
-				$value = isset($buckets[$key]) ? $buckets[$key] : ($this->multiple ? array() : null);
-				if ($primaryModel instanceof ActiveRecord) {
-					$primaryModel->populateRelation($name, $value);
-				} else {
-					$primaryModels[$i][$name] = $value;
-				}
-			}
-			return $models;
-		}
-	}
-
-	/**
-	 * @param array $models
-	 * @param array $link
-	 * @param array $viaModels
-	 * @param array $viaLink
-	 * @return array
-	 */
-	private function buildBuckets($models, $link, $viaModels = null, $viaLink = null)
-	{
-		$buckets = array();
-		$linkKeys = array_keys($link);
-		foreach ($models as $i => $model) {
-			$key = $this->getModelKey($model, $linkKeys);
-			if ($this->indexBy !== null) {
-				$buckets[$key][$i] = $model;
-			} else {
-				$buckets[$key][] = $model;
-			}
-		}
-
-		if ($viaModels !== null) {
-			$viaBuckets = array();
-			$viaLinkKeys = array_keys($viaLink);
-			$linkValues = array_values($link);
-			foreach ($viaModels as $viaModel) {
-				$key1 = $this->getModelKey($viaModel, $viaLinkKeys);
-				$key2 = $this->getModelKey($viaModel, $linkValues);
-				if (isset($buckets[$key2])) {
-					foreach ($buckets[$key2] as $i => $bucket) {
-						if ($this->indexBy !== null) {
-							$viaBuckets[$key1][$i] = $bucket;
-						} else {
-							$viaBuckets[$key1][] = $bucket;
-						}
-					}
-				}
-			}
-			$buckets = $viaBuckets;
-		}
-
-		if (!$this->multiple) {
-			foreach ($buckets as $i => $bucket) {
-				$buckets[$i] = reset($bucket);
-			}
-		}
-		return $buckets;
-	}
-
-	/**
-	 * @param ActiveRecord|array $model
-	 * @param array $attributes
-	 * @return string
-	 */
-	private function getModelKey($model, $attributes)
-	{
-		if (count($attributes) > 1) {
-			$key = array();
-			foreach ($attributes as $attribute) {
-				$key[] = $model[$attribute];
-			}
-			return serialize($key);
-		} else {
-			$attribute = reset($attributes);
-			return $model[$attribute];
-		}
-	}
-
-
-	/**
-	 * @param array $models
-	 */
-	private function filterByModels($models)
-	{
-		$attributes = array_keys($this->link);
-		$values = array();
-		if (count($attributes) ===1) {
-			// single key
-			$attribute = reset($this->link);
-			foreach ($models as $model) {
-				$values[] = $model[$attribute];
-			}
-		} else {
-			// composite keys
-			foreach ($models as $model) {
-				$v = array();
-				foreach ($this->link as $attribute => $link) {
-					$v[$attribute] = $model[$link];
-				}
-				$values[] = $v;
-			}
-		}
-		$this->primaryKeys($values);
-	}
-
-}
diff --git a/yii/db/redis/Connection.php b/yii/db/redis/Connection.php
deleted file mode 100644
index 72c80de..0000000
--- a/yii/db/redis/Connection.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-/**
- * Connection class file
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\redis;
-
-use \yii\base\Component;
-use yii\base\InvalidConfigException;
-use \yii\db\Exception;
-use yii\helpers\StringHelper;
-
-/**
- *
- *
- *
- * @method mixed set($key, $value) Set the string value of a key
- * @method mixed get($key) Set the string value of a key
- * TODO document methods
- *
- * @since 2.0
- */
-class Connection extends Component
-{
-	/**
-	 * @event Event an event that is triggered after a DB connection is established
-	 */
-	const EVENT_AFTER_OPEN = 'afterOpen';
-
-	/**
-	 * @var string the Data Source Name, or DSN, contains the information required to connect to the database.
-	 * DSN format: redis://server:port[/db]
-	 * Where db is a zero based integer which refers to the DB to use.
-	 * If no DB is given, ID 0 is used.
-	 *
-	 * Example: redis://localhost:6379/2
-	 */
-	public $dsn;
-	/**
-	 * @var string the password for establishing DB connection. Defaults to null meaning no AUTH command is send.
-	 * See http://redis.io/commands/auth
-	 */
-	public $password;
-	/**
-	 * @var float timeout to use for connection to redis. If not set the timeout set in php.ini will be used: ini_get("default_socket_timeout")
-	 */
-	public $timeout = null;
-
-	/**
-	 * @var array List of available redis commands http://redis.io/commands
-	 */
-	public $redisCommands = array(
-		'BRPOP', // key [key ...] timeout Remove and get the last element in a list, or block until one is available
-		'BRPOPLPUSH', // source destination timeout Pop a value from a list, push it to another list and return it; or block until one is available
-		'CLIENT KILL', // ip:port Kill the connection of a client
-		'CLIENT LIST', // Get the list of client connections
-		'CLIENT GETNAME', // Get the current connection name
-		'CLIENT SETNAME', // connection-name Set the current connection name
-		'CONFIG GET', // parameter Get the value of a configuration parameter
-		'CONFIG SET', // parameter value Set a configuration parameter to the given value
-		'CONFIG RESETSTAT', // Reset the stats returned by INFO
-		'DBSIZE', // Return the number of keys in the selected database
-		'DEBUG OBJECT', // key Get debugging information about a key
-		'DEBUG SEGFAULT', // Make the server crash
-		'DECR', // key Decrement the integer value of a key by one
-		'DECRBY', // key decrement Decrement the integer value of a key by the given number
-		'DEL', // key [key ...] Delete a key
-		'DISCARD', // Discard all commands issued after MULTI
-		'DUMP', // key Return a serialized version of the value stored at the specified key.
-		'ECHO', // message Echo the given string
-		'EVAL', // script numkeys key [key ...] arg [arg ...] Execute a Lua script server side
-		'EVALSHA', // sha1 numkeys key [key ...] arg [arg ...] Execute a Lua script server side
-		'EXEC', // Execute all commands issued after MULTI
-		'EXISTS', // key Determine if a key exists
-		'EXPIRE', // key seconds Set a key's time to live in seconds
-		'EXPIREAT', // key timestamp Set the expiration for a key as a UNIX timestamp
-		'FLUSHALL', // Remove all keys from all databases
-		'FLUSHDB', // Remove all keys from the current database
-		'GET', // key Get the value of a key
-		'GETBIT', // key offset Returns the bit value at offset in the string value stored at key
-		'GETRANGE', // key start end Get a substring of the string stored at a key
-		'GETSET', // key value Set the string value of a key and return its old value
-		'HDEL', // key field [field ...] Delete one or more hash fields
-		'HEXISTS', // key field Determine if a hash field exists
-		'HGET', // key field Get the value of a hash field
-		'HGETALL', // key Get all the fields and values in a hash
-		'HINCRBY', // key field increment Increment the integer value of a hash field by the given number
-		'HINCRBYFLOAT', // key field increment Increment the float value of a hash field by the given amount
-		'HKEYS', // key Get all the fields in a hash
-		'HLEN', // key Get the number of fields in a hash
-		'HMGET', // key field [field ...] Get the values of all the given hash fields
-		'HMSET', // key field value [field value ...] Set multiple hash fields to multiple values
-		'HSET', // key field value Set the string value of a hash field
-		'HSETNX', // key field value Set the value of a hash field, only if the field does not exist
-		'HVALS', // key Get all the values in a hash
-		'INCR', // key Increment the integer value of a key by one
-		'INCRBY', // key increment Increment the integer value of a key by the given amount
-		'INCRBYFLOAT', // key increment Increment the float value of a key by the given amount
-		'INFO', // [section] Get information and statistics about the server
-		'KEYS', // pattern Find all keys matching the given pattern
-		'LASTSAVE', // Get the UNIX time stamp of the last successful save to disk
-		'LINDEX', // key index Get an element from a list by its index
-		'LINSERT', // key BEFORE|AFTER pivot value Insert an element before or after another element in a list
-		'LLEN', // key Get the length of a list
-		'LPOP', // key Remove and get the first element in a list
-		'LPUSH', // key value [value ...] Prepend one or multiple values to a list
-		'LPUSHX', // key value Prepend a value to a list, only if the list exists
-		'LRANGE', // key start stop Get a range of elements from a list
-		'LREM', // key count value Remove elements from a list
-		'LSET', // key index value Set the value of an element in a list by its index
-		'LTRIM', // key start stop Trim a list to the specified range
-		'MGET', // key [key ...] Get the values of all the given keys
-		'MIGRATE', // host port key destination-db timeout Atomically transfer a key from a Redis instance to another one.
-		'MONITOR', // Listen for all requests received by the server in real time
-		'MOVE', // key db Move a key to another database
-		'MSET', // key value [key value ...] Set multiple keys to multiple values
-		'MSETNX', // key value [key value ...] Set multiple keys to multiple values, only if none of the keys exist
-		'MULTI', // Mark the start of a transaction block
-		'OBJECT', // subcommand [arguments [arguments ...]] Inspect the internals of Redis objects
-		'PERSIST', // key Remove the expiration from a key
-		'PEXPIRE', // key milliseconds Set a key's time to live in milliseconds
-		'PEXPIREAT', // key milliseconds-timestamp Set the expiration for a key as a UNIX timestamp specified in milliseconds
-		'PING', // Ping the server
-		'PSETEX', // key milliseconds value Set the value and expiration in milliseconds of a key
-		'PSUBSCRIBE', // pattern [pattern ...] Listen for messages published to channels matching the given patterns
-		'PTTL', // key Get the time to live for a key in milliseconds
-		'PUBLISH', // channel message Post a message to a channel
-		'PUNSUBSCRIBE', // [pattern [pattern ...]] Stop listening for messages posted to channels matching the given patterns
-		'QUIT', // Close the connection
-		'RANDOMKEY', // Return a random key from the keyspace
-		'RENAME', // key newkey Rename a key
-		'RENAMENX', // key newkey Rename a key, only if the new key does not exist
-		'RESTORE', // key ttl serialized-value Create a key using the provided serialized value, previously obtained using DUMP.
-		'RPOP', // key Remove and get the last element in a list
-		'RPOPLPUSH', // source destination Remove the last element in a list, append it to another list and return it
-		'RPUSH', // key value [value ...] Append one or multiple values to a list
-		'RPUSHX', // key value Append a value to a list, only if the list exists
-		'SADD', // key member [member ...] Add one or more members to a set
-		'SAVE', // Synchronously save the dataset to disk
-		'SCARD', // key Get the number of members in a set
-		'SCRIPT EXISTS', // script [script ...] Check existence of scripts in the script cache.
-		'SCRIPT FLUSH', // Remove all the scripts from the script cache.
-		'SCRIPT KILL', // Kill the script currently in execution.
-		'SCRIPT LOAD', // script Load the specified Lua script into the script cache.
-		'SDIFF', // key [key ...] Subtract multiple sets
-		'SDIFFSTORE', // destination key [key ...] Subtract multiple sets and store the resulting set in a key
-		'SELECT', // index Change the selected database for the current connection
-		'SET', // key value Set the string value of a key
-		'SETBIT', // key offset value Sets or clears the bit at offset in the string value stored at key
-		'SETEX', // key seconds value Set the value and expiration of a key
-		'SETNX', // key value Set the value of a key, only if the key does not exist
-		'SETRANGE', // key offset value Overwrite part of a string at key starting at the specified offset
-		'SHUTDOWN', // [NOSAVE] [SAVE] Synchronously save the dataset to disk and then shut down the server
-		'SINTER', // key [key ...] Intersect multiple sets
-		'SINTERSTORE', // destination key [key ...] Intersect multiple sets and store the resulting set in a key
-		'SISMEMBER', // key member Determine if a given value is a member of a set
-		'SLAVEOF', // host port Make the server a slave of another instance, or promote it as master
-		'SLOWLOG', // subcommand [argument] Manages the Redis slow queries log
-		'SMEMBERS', // key Get all the members in a set
-		'SMOVE', // source destination member Move a member from one set to another
-		'SORT', // key [BY pattern] [LIMIT offset count] [GET pattern [GET pattern ...]] [ASC|DESC] [ALPHA] [STORE destination] Sort the elements in a list, set or sorted set
-		'SPOP', // key Remove and return a random member from a set
-		'SRANDMEMBER', // key [count] Get one or multiple random members from a set
-		'SREM', // key member [member ...] Remove one or more members from a set
-		'STRLEN', // key Get the length of the value stored in a key
-		'SUBSCRIBE', // channel [channel ...] Listen for messages published to the given channels
-		'SUNION', // key [key ...] Add multiple sets
-		'SUNIONSTORE', // destination key [key ...] Add multiple sets and store the resulting set in a key
-		'SYNC', // Internal command used for replication
-		'TIME', // Return the current server time
-		'TTL', // key Get the time to live for a key
-		'TYPE', // key Determine the type stored at key
-		'UNSUBSCRIBE', // [channel [channel ...]] Stop listening for messages posted to the given channels
-		'UNWATCH', // Forget about all watched keys
-		'WATCH', // key [key ...] Watch the given keys to determine execution of the MULTI/EXEC block
-		'ZADD', // key score member [score member ...] Add one or more members to a sorted set, or update its score if it already exists
-		'ZCARD', // key Get the number of members in a sorted set
-		'ZCOUNT', // key min max Count the members in a sorted set with scores within the given values
-		'ZINCRBY', // key increment member Increment the score of a member in a sorted set
-		'ZINTERSTORE', // destination numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX] Intersect multiple sorted sets and store the resulting sorted set in a new key
-		'ZRANGE', // key start stop [WITHSCORES] Return a range of members in a sorted set, by index
-		'ZRANGEBYSCORE', // key min max [WITHSCORES] [LIMIT offset count] Return a range of members in a sorted set, by score
-		'ZRANK', // key member Determine the index of a member in a sorted set
-		'ZREM', // key member [member ...] Remove one or more members from a sorted set
-		'ZREMRANGEBYRANK', // key start stop Remove all members in a sorted set within the given indexes
-		'ZREMRANGEBYSCORE', // key min max Remove all members in a sorted set within the given scores
-		'ZREVRANGE', // key start stop [WITHSCORES] Return a range of members in a sorted set, by index, with scores ordered from high to low
-		'ZREVRANGEBYSCORE', // key max min [WITHSCORES] [LIMIT offset count] Return a range of members in a sorted set, by score, with scores ordered from high to low
-		'ZREVRANK', // key member Determine the index of a member in a sorted set, with scores ordered from high to low
-		'ZSCORE', // key member Get the score associated with the given member in a sorted set
-		'ZUNIONSTORE', // destination numkeys key [key ...] [WEIGHTS weight [weight ...]] [AGGREGATE SUM|MIN|MAX] Add multiple sorted sets and store the resulting sorted set in a new key
-	);
-	/**
-	 * @var Transaction the currently active transaction
-	 */
-	private $_transaction;
-	/**
-	 * @var resource redis socket connection
-	 */
-	private $_socket;
-
-	/**
-	 * Closes the connection when this component is being serialized.
-	 * @return array
-	 */
-	public function __sleep()
-	{
-		$this->close();
-		return array_keys(get_object_vars($this));
-	}
-
-	/**
-	 * Returns a value indicating whether the DB connection is established.
-	 * @return boolean whether the DB connection is established
-	 */
-	public function getIsActive()
-	{
-		return $this->_socket !== null;
-	}
-
-	/**
-	 * Establishes a DB connection.
-	 * It does nothing if a DB connection has already been established.
-	 * @throws Exception if connection fails
-	 */
-	public function open()
-	{
-		if ($this->_socket === null) {
-			if (empty($this->dsn)) {
-				throw new InvalidConfigException('Connection.dsn cannot be empty.');
-			}
-			$dsn = explode('/', $this->dsn);
-			$host = $dsn[2];
-			if (strpos($host, ':')===false) {
-				$host .= ':6379';
-			}
-			$db = isset($dsn[3]) ? $dsn[3] : 0;
-
-			\Yii::trace('Opening DB connection: ' . $this->dsn, __CLASS__);
-			$this->_socket = @stream_socket_client(
-				$host,
-				$errorNumber,
-				$errorDescription,
-				$this->timeout ? $this->timeout : ini_get("default_socket_timeout")
-			);
-			if ($this->_socket) {
-				if ($this->password !== null) {
-					$this->executeCommand('AUTH', array($this->password));
-				}
-				$this->executeCommand('SELECT', array($db));
-				$this->initConnection();
-			} else {
-				\Yii::error("Failed to open DB connection ({$this->dsn}): " . $errorNumber . ' - ' . $errorDescription, __CLASS__);
-				$message = YII_DEBUG ? 'Failed to open DB connection: ' . $errorNumber . ' - ' . $errorDescription : 'Failed to open DB connection.';
-				throw new Exception($message, $errorDescription, (int)$errorNumber);
-			}
-		}
-	}
-
-	/**
-	 * Closes the currently active DB connection.
-	 * It does nothing if the connection is already closed.
-	 */
-	public function close()
-	{
-		if ($this->_socket !== null) {
-			\Yii::trace('Closing DB connection: ' . $this->dsn, __CLASS__);
-			$this->executeCommand('QUIT');
-			stream_socket_shutdown($this->_socket, STREAM_SHUT_RDWR);
-			$this->_socket = null;
-			$this->_transaction = null;
-		}
-	}
-
-	/**
-	 * Initializes the DB connection.
-	 * This method is invoked right after the DB connection is established.
-	 * The default implementation triggers an [[EVENT_AFTER_OPEN]] event.
-	 */
-	protected function initConnection()
-	{
-		$this->trigger(self::EVENT_AFTER_OPEN);
-	}
-
-	/**
-	 * Returns the currently active transaction.
-	 * @return Transaction the currently active transaction. Null if no active transaction.
-	 */
-	public function getTransaction()
-	{
-		return $this->_transaction && $this->_transaction->isActive ? $this->_transaction : null;
-	}
-
-	/**
-	 * Starts a transaction.
-	 * @return Transaction the transaction initiated
-	 */
-	public function beginTransaction()
-	{
-		$this->open();
-		$this->_transaction = new Transaction(array(
-			'db' => $this,
-		));
-		$this->_transaction->begin();
-		return $this->_transaction;
-	}
-
-	/**
-	 * Returns the name of the DB driver for the current [[dsn]].
-	 * @return string name of the DB driver
-	 */
-	public function getDriverName()
-	{
-		if (($pos = strpos($this->dsn, ':')) !== false) {
-			return strtolower(substr($this->dsn, 0, $pos));
-		} else {
-			return 'redis';
-		}
-	}
-
-	/**
-	 *
-	 * @param string $name
-	 * @param array $params
-	 * @return mixed
-	 */
-	public function __call($name, $params)
-	{
-		$redisCommand = strtoupper(StringHelper::camel2words($name, false));
-		if (in_array($redisCommand, $this->redisCommands)) {
-			return $this->executeCommand($name, $params);
-		} else {
-			return parent::__call($name, $params);
-		}
-	}
-
-	/**
-	 * Executes a redis command.
-	 * For a list of available commands and their parameters see http://redis.io/commands.
-	 *
-	 * @param string $name the name of the command
-	 * @param array $params list of parameters for the command
-	 * @return array|bool|null|string Dependend on the executed command this method
-	 * will return different data types:
-	 *
-	 * - `true` for commands that return "status reply".
-	 * - `string` for commands that return "integer reply"
-	 *   as the value is in the range of a signed 64 bit integer.
-	 * - `string` or `null` for commands that return "bulk reply".
-	 * - `array` for commands that return "Multi-bulk replies".
-	 *
-	 * See [redis protocol description](http://redis.io/topics/protocol)
-	 * for details on the mentioned reply types.
-	 * @trows Exception for commands that return [error reply](http://redis.io/topics/protocol#error-reply).
-	 */
-	public function executeCommand($name, $params=array())
-	{
-		$this->open();
-
-		array_unshift($params, $name);
-		$command = '*' . count($params) . "\r\n";
-		foreach($params as $arg) {
-			$command .= '$' . strlen($arg) . "\r\n" . $arg . "\r\n";
-		}
-
-		\Yii::trace("Executing Redis Command: {$name}", __CLASS__);
-		fwrite($this->_socket, $command);
-
-		return $this->parseResponse(implode(' ', $params));
-	}
-
-	private function parseResponse($command)
-	{
-		if(($line = fgets($this->_socket))===false) {
-			throw new Exception("Failed to read from socket.\nRedis command was: " . $command);
-		}
-		$type = $line[0];
-		$line = substr($line, 1, -2);
-		switch($type)
-		{
-			case '+': // Status reply
-				return true;
-			case '-': // Error reply
-				throw new Exception("Redis error: " . $line . "\nRedis command was: " . $command);
-			case ':': // Integer reply
-				// no cast to int as it is in the range of a signed 64 bit integer
-				return $line;
-			case '$': // Bulk replies
-				if ($line == '-1') {
-					return null;
-				}
-				if(($data = fread($this->_socket, $line + 2))===false) {
-					throw new Exception("Failed to read from socket.\nRedis command was: " . $command);
-				}
-				return substr($data, 0, -2);
-			case '*': // Multi-bulk replies
-				$count = (int) $line;
-				$data = array();
-				for($i = 0; $i < $count; $i++) {
-					$data[] = $this->parseResponse($command);
-				}
-				return $data;
-			default:
-				throw new Exception('Received illegal data from redis: ' . $line . "\nRedis command was: " . $command);
-		}
-	}
-}
diff --git a/yii/db/redis/Transaction.php b/yii/db/redis/Transaction.php
deleted file mode 100644
index 721a7be..0000000
--- a/yii/db/redis/Transaction.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/**
- * Transaction class file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-namespace yii\db\redis;
-
-use yii\base\InvalidConfigException;
-use yii\db\Exception;
-
-/**
- * Transaction represents a DB transaction.
- *
- * @property boolean $isActive Whether the transaction is active. This property is read-only.
- *
- * @since 2.0
- */
-class Transaction extends \yii\base\Object
-{
-	/**
-	 * @var Connection the database connection that this transaction is associated with.
-	 */
-	public $db;
-	/**
-	 * @var boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollBack()]]. This property is set true when the transaction is started.
-	 */
-	private $_active = false;
-
-	/**
-	 * Returns a value indicating whether this transaction is active.
-	 * @return boolean whether this transaction is active. Only an active transaction
-	 * can [[commit()]] or [[rollBack()]].
-	 */
-	public function getIsActive()
-	{
-		return $this->_active;
-	}
-
-	/**
-	 * Begins a transaction.
-	 * @throws InvalidConfigException if [[connection]] is null
-	 */
-	public function begin()
-	{
-		if (!$this->_active) {
-			if ($this->db === null) {
-				throw new InvalidConfigException('Transaction::db must be set.');
-			}
-			\Yii::trace('Starting transaction', __CLASS__);
-			$this->db->open();
-			$this->db->createCommand('MULTI')->execute();
-			$this->_active = true;
-		}
-	}
-
-	/**
-	 * Commits a transaction.
-	 * @throws Exception if the transaction or the DB connection is not active.
-	 */
-	public function commit()
-	{
-		if ($this->_active && $this->db && $this->db->isActive) {
-			\Yii::trace('Committing transaction', __CLASS__);
-			$this->db->createCommand('EXEC')->execute();
-			// TODO handle result of EXEC
-			$this->_active = false;
-		} else {
-			throw new Exception('Failed to commit transaction: transaction was inactive.');
-		}
-	}
-
-	/**
-	 * Rolls back a transaction.
-	 * @throws Exception if the transaction or the DB connection is not active.
-	 */
-	public function rollback()
-	{
-		if ($this->_active && $this->db && $this->db->isActive) {
-			\Yii::trace('Rolling back transaction', __CLASS__);
-			$this->db->pdo->commit();
-			$this->_active = false;
-		} else {
-			throw new Exception('Failed to roll back transaction: transaction was inactive.');
-		}
-	}
-}
diff --git a/yii/db/redis/schema.md b/yii/db/redis/schema.md
deleted file mode 100644
index 1bd45b3..0000000
--- a/yii/db/redis/schema.md
+++ /dev/null
@@ -1,35 +0,0 @@
-To allow AR to be stored in redis we need a special Schema for it.
-
-HSET prefix:className:primaryKey
-
-
-http://redis.io/commands
-
-Current Redis connection:
-https://github.com/jamm/Memory
-
-
-# Queries
-
-wrap all these in transactions MULTI
-
-## insert
-
-SET all attribute key-value pairs
-SET all relation key-value pairs
-make sure to create back-relations
-
-## update
-
-SET all attribute key-value pairs
-SET all relation key-value pairs
-
-
-## delete
-
-DEL all attribute key-value pairs
-DEL all relation key-value pairs
-make sure to update back-relations
-
-
-http://redis.io/commands/hmget sounds suiteable!
\ No newline at end of file