Browse Source

DB cleanup

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
9958a5802e
  1. 6
      framework/db/ActiveQuery.php
  2. 19
      framework/db/Query.php
  3. 31
      tests/unit/framework/db/CommandTest.php
  4. 5
      tests/unit/framework/db/ConnectionTest.php

6
framework/db/ActiveQuery.php

@ -34,9 +34,9 @@ use yii\db\Exception;
* *
* ActiveQuery also provides the following additional query options: * ActiveQuery also provides the following additional query options:
* *
* - [[with]]: list of relations that this query should be performed with. * - [[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. * - [[indexBy()]]: the name of the column by which the query result should be indexed.
* - [[asArray]]: whether to return each record as an array. * - [[asArray()]]: whether to return each record as an array.
* *
* These options can be configured using methods of the same name. For example: * These options can be configured using methods of the same name. For example:
* *

19
framework/db/Query.php

@ -10,13 +10,15 @@
namespace yii\db; namespace yii\db;
/** /**
* Query represents a SQL statement in a way that is independent of DBMS. * Query represents a SELECT SQL statement in a way that is independent of DBMS.
* *
* Query not only can represent a SELECT statement, it can also represent INSERT, UPDATE, DELETE, * Query provides a set of methods to facilitate the specification of different clauses
* and other commonly used DDL statements, such as CREATE TABLE, CREATE INDEX, etc. * in a SELECT statement. These methods can be chained together.
* *
* Query provides a set of methods to facilitate the specification of different clauses. * By calling [[createCommand()]], we can get a [[Command]] instance which can be further
* These methods can be chained together. For example, * used to perform/execute the DB query against a database.
*
* For example,
* *
* ~~~ * ~~~
* $query = new Query; * $query = new Query;
@ -24,12 +26,11 @@ namespace yii\db;
* ->from('tbl_user') * ->from('tbl_user')
* ->limit(10); * ->limit(10);
* // build and execute the query * // build and execute the query
* $users = $query->createCommand()->queryAll(); * $command = $query->createCommand();
* // $command->sql returns the actual SQL
* $rows = $command->queryAll();
* ~~~ * ~~~
* *
* By calling [[createCommand()]], we can get a [[Command]] instance which can be further
* used to perform/execute the DB query against a database.
*
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */

31
tests/unit/framework/db/CommandTest.php

@ -223,7 +223,6 @@ class CommandTest extends \yiiunit\MysqlTestCase
$this->assertTrue(is_array($result) && isset($result[0])); $this->assertTrue(is_array($result) && isset($result[0]));
} }
function testInsert() function testInsert()
{ {
@ -298,34 +297,4 @@ class CommandTest extends \yiiunit\MysqlTestCase
{ {
} }
function testParams()
{
}
function testGetSql()
{
}
function testCreateCommand()
{
}
function testReset()
{
}
function testToArray()
{
}
function testMergeWith()
{
}
} }

5
tests/unit/framework/db/ConnectionTest.php

@ -75,9 +75,4 @@ class ConnectionTest extends \yiiunit\MysqlTestCase
$this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}')); $this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
$this->assertEquals('(column)', $connection->quoteColumnName('(column)')); $this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
} }
function testAttribute()
{
}
} }

Loading…
Cancel
Save