moved db tests.

framework/db/ActiveRecord.php

@@ -189,9 +189,9 @@ abstract class ActiveRecord extends Model
 	 */
 	public static function updateAll($attributes, $condition = '', $params = array())
 	{
-		$query = new Query;
+		$command = static::getDbConnection()->createCommand();
-		$query->update(static::tableName(), $attributes, $condition, $params);
+		$command->update(static::tableName(), $attributes, $condition, $params);
-		return $query->createCommand(static::getDbConnection())->execute();
+		return $command->execute();
 	}
 
 	/**
@@ -210,9 +210,9 @@ abstract class ActiveRecord extends Model
 			$quotedName = $db->quoteColumnName($name, true);
 			$counters[$name] = new Expression($value >= 0 ? "$quotedName+$value" : "$quotedName$value");
 		}
-		$query = new Query;
+		$command = $db->createCommand();
-		$query->update(static::tableName(), $counters, $condition, $params);
+		$command->update(static::tableName(), $counters, $condition, $params);
-		return $query->createCommand($db)->execute();
+		return $command->execute();
 	}
 
 	/**
@@ -224,9 +224,9 @@ abstract class ActiveRecord extends Model
 	 */
 	public static function deleteAll($condition = '', $params = array())
 	{
-		$query = new Query;
+		$command = static::getDbConnection()->createCommand();
-		$query->delete(static::tableName(), $condition, $params);
+		$command->delete(static::tableName(), $condition, $params);
-		return $query->createCommand(static::getDbConnection())->execute();
+		return $command->execute();
 	}
 
 	/**
@@ -587,10 +587,9 @@ abstract class ActiveRecord extends Model
 	public function insert($attributes = null)
 	{
 		if ($this->beforeInsert()) {
-			$query = new Query;
 			$values = $this->getChangedAttributes($attributes);
 			$db = $this->getDbConnection();
-			$command = $query->insert($this->tableName(), $values)->createCommand($db);
+			$command = $db->createCommand()->insert($this->tableName(), $values);
 			if ($command->execute()) {
 				$table = $this->getTableSchema();
 				if ($table->sequenceName !== null) {

tests/unit/framework/db/ActiveRecordTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\framework\db\ar;
+namespace yiiunit\framework\db;
 
 use yii\db\Query;
 use yii\db\ActiveQuery;

tests/unit/framework/db/CommandTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\framework\db\dao;
+namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 use yii\db\Command;
@@ -213,4 +213,110 @@ class CommandTest extends \yiiunit\MysqlTestCase
 		$result = $command->queryRow(array(), \PDO::FETCH_NUM);
 		$this->assertTrue(is_array($result) && isset($result[0]));
 	}
+
+
+	function testInsert()
+	{
+
+	}
+
+	function testUpdate()
+	{
+
+	}
+
+	function testDelete()
+	{
+
+	}
+
+	function testCreateTable()
+	{
+
+	}
+
+	function testRenameTable()
+	{
+
+	}
+
+	function testDropTable()
+	{
+
+	}
+
+	function testTruncateTable()
+	{
+
+	}
+
+	function testAddColumn()
+	{
+
+	}
+
+	function testDropColumn()
+	{
+
+	}
+
+	function testRenameColumn()
+	{
+
+	}
+
+	function testAlterColumn()
+	{
+
+	}
+
+	function testAddForeignKey()
+	{
+
+	}
+
+	function testDropForeignKey()
+	{
+
+	}
+
+	function testCreateIndex()
+	{
+
+	}
+
+	function testDropIndex()
+	{
+
+	}
+
+	function testParams()
+	{
+
+	}
+
+	function testGetSql()
+	{
+
+	}
+
+	function testCreateCommand()
+	{
+
+	}
+
+	function testReset()
+	{
+
+	}
+
+	function testToArray()
+	{
+
+	}
+
+	function testMergeWith()
+	{
+
+	}
 }

tests/unit/framework/db/ConnectionTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\framework\db\dao;
+namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 

tests/unit/framework/db/QueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace yiiunit\framework\db\dao;
+namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 use yii\db\Command;
@@ -107,109 +107,4 @@ class QueryTest extends \yiiunit\MysqlTestCase
 	{
 
 	}
-
-	function testInsert()
-	{
-
-	}
-
-	function testUpdate()
-	{
-
-	}
-
-	function testDelete()
-	{
-
-	}
-
-	function testCreateTable()
-	{
-
-	}
-
-	function testRenameTable()
-	{
-
-	}
-
-	function testDropTable()
-	{
-
-	}
-
-	function testTruncateTable()
-	{
-
-	}
-
-	function testAddColumn()
-	{
-
-	}
-
-	function testDropColumn()
-	{
-
-	}
-
-	function testRenameColumn()
-	{
-
-	}
-
-	function testAlterColumn()
-	{
-
-	}
-
-	function testAddForeignKey()
-	{
-
-	}
-
-	function testDropForeignKey()
-	{
-
-	}
-
-	function testCreateIndex()
-	{
-
-	}
-
-	function testDropIndex()
-	{
-
-	}
-
-	function testParams()
-	{
-
-	}
-
-	function testGetSql()
-	{
-
-	}
-
-	function testCreateCommand()
-	{
-
-	}
-
-	function testReset()
-	{
-
-	}
-
-	function testToArray()
-	{
-
-	}
-
-	function testMergeWith()
-	{
-
-	}
 }