Merge branch 'master' of https://github.com/yiisoft/yii2 into sphinx

apps/advanced/console/migrations/m130524_201442_init.php

@@ -6,19 +6,21 @@ class m130524_201442_init extends \yii\db\Migration
 {
 	public function up()
 	{
-		// MySQL-specific table options. Adjust if you plan working with another DBMS
+		$tableOptions = null;
+		if ($this->db->driverName === 'mysql') {
 			$tableOptions = 'CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE=InnoDB';
+		}
 
 		$this->createTable('tbl_user', [
 			'id' => Schema::TYPE_PK,
-			'username' => Schema::TYPE_STRING.' NOT NULL',
-			'auth_key' => Schema::TYPE_STRING.'(32) NOT NULL',
-			'password_hash' => Schema::TYPE_STRING.' NOT NULL',
-			'password_reset_token' => Schema::TYPE_STRING.'(32)',
-			'email' => Schema::TYPE_STRING.' NOT NULL',
-			'role' => 'tinyint NOT NULL DEFAULT 10',
+			'username' => Schema::TYPE_STRING . ' NOT NULL',
+			'auth_key' => Schema::TYPE_STRING . '(32) NOT NULL',
+			'password_hash' => Schema::TYPE_STRING . ' NOT NULL',
+			'password_reset_token' => Schema::TYPE_STRING . '(32)',
+			'email' => Schema::TYPE_STRING . ' NOT NULL',
+			'role' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
 
-			'status' => 'tinyint NOT NULL DEFAULT 10',
+			'status' => Schema::TYPE_SMALLINT . ' NOT NULL DEFAULT 10',
 			'create_time' => Schema::TYPE_INTEGER.' NOT NULL',
 			'update_time' => Schema::TYPE_INTEGER.' NOT NULL',
 		], $tableOptions);