Browse Source

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
tags/2.0.0-beta
Qiang Xue 13 years ago
parent
commit
5357388d24
  1. 5
      framework/db/dao/Connection.php
  2. 2
      tests/unit/data/config.php
  3. 2
      tests/unit/data/mysql.sql

5
framework/db/dao/Connection.php

@ -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.

2
tests/unit/data/config.php

@ -7,4 +7,4 @@ return array(
'password' => '', 'password' => '',
'fixture' => __DIR__ . '/mysql.sql', 'fixture' => __DIR__ . '/mysql.sql',
), ),
); );

2
tests/unit/data/mysql.sql

@ -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;

Loading…
Cancel
Save