Commit 5357388d by Qiang Xue

Merge branch 'master' of dev.yiisoft.com:yii2

Conflicts: framework/db/dao/Command.php framework/db/dao/Connection.php framework/db/dao/Query.php framework/db/dao/mysql/Schema.php tests/unit/data/config.php tests/unit/data/mysql.sql tests/unit/framework/db/dao/ConnectionTest.php
parents be87e178 a6e43334
...@@ -471,6 +471,11 @@ class Connection extends \yii\base\ApplicationComponent ...@@ -471,6 +471,11 @@ class Connection extends \yii\base\ApplicationComponent
} }
} }
public function getQueryBuilder()
{
return $this->getSchema()->getQueryBuilder();
}
/** /**
* Returns the query builder for the current DB connection. * Returns the query builder for the current DB connection.
* @return QueryBuilder the query builder for the current DB connection. * @return QueryBuilder the query builder for the current DB connection.
......
...@@ -7,4 +7,4 @@ return array( ...@@ -7,4 +7,4 @@ return array(
'password' => '', 'password' => '',
'fixture' => __DIR__ . '/mysql.sql', 'fixture' => __DIR__ . '/mysql.sql',
), ),
); );
\ No newline at end of file
...@@ -157,4 +157,4 @@ CREATE TABLE types ...@@ -157,4 +157,4 @@ CREATE TABLE types
time TIMESTAMP DEFAULT '2002-01-01', time TIMESTAMP DEFAULT '2002-01-01',
bool_col BOOL NOT NULL, bool_col BOOL NOT NULL,
bool_col2 BOOLEAN DEFAULT 1 bool_col2 BOOLEAN DEFAULT 1
) TYPE=INNODB; ) TYPE=INNODB;
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment