php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

code style fixes

Browse Source
This commit is contained in:
Alexander Makarov
2013-06-13 02:16:48 +04:00
parent 17b1e5d2fc
commit cc0fe1b02c
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/db/Migration.php
View File

@@ -318,7 +318,7 @@ class Migration extends \yii\base\Component
*/
public function addPrimaryKey($name, $table, $columns)
{
echo " > add primary key $name on $table (".(is_array($columns) ? implode(',',$columns) : $columns).") ...";
echo " > add primary key $name on $table (".(is_array($columns) ? implode(',', $columns) : $columns).") ...";
$time = microtime(true);
$this->db->createCommand()->addPrimaryKey($name, $table, $columns)->execute();
echo " done (time: " . sprintf('%.3f', microtime(true) - $time) . "s)\n";

13
framework/yii/db/QueryBuilder.php
View File

@@ -279,17 +279,17 @@ class QueryBuilder extends \yii\base\Object
public function addPrimaryKey($name, $table, $columns)
{
if (is_string($columns)) {
$columns=preg_split('/\s*,\s*/',$columns,-1,PREG_SPLIT_NO_EMPTY);
$columns = preg_split('/\s*,\s*/', $columns, -1, PREG_SPLIT_NO_EMPTY);
}
foreach ($columns as $i=>$col) {
$columns[$i]=$this->db->quoteColumnName($col);
foreach ($columns as $i => $col) {
$columns[$i] = $this->db->quoteColumnName($col);
}
return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' ADD CONSTRAINT '
. $this->db->quoteColumnName($name) . ' PRIMARY KEY ('
. implode(', ', $columns). ' )';
}
}
/**
* Builds a SQL statement for removing a primary key constraint to an existing table.
@@ -301,8 +301,7 @@ class QueryBuilder extends \yii\base\Object
{
return 'ALTER TABLE ' . $this->db->quoteTableName($table)
. ' DROP CONSTRAINT ' . $this->db->quoteColumnName($name);
}
}
/**
* Builds a SQL statement for truncating a DB table.

9
framework/yii/db/sqlite/QueryBuilder.php
View File

@@ -191,8 +191,8 @@ class QueryBuilder extends \yii\db\QueryBuilder
public function addPrimaryKey($name, $table, $columns)
{
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
}
}
/**
* Builds a SQL statement for removing a primary key constraint to an existing table.
* @param string $name the name of the primary key constraint to be removed.
@@ -202,7 +202,6 @@ class QueryBuilder extends \yii\db\QueryBuilder
*/
public function dropPrimaryKey($name, $table)
{
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
}
throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
}
}

3
framework/yii/rbac/PhpManager.php
View File

@@ -356,8 +356,7 @@ class PhpManager extends Manager
*/
public function saveItem($item, $oldName = null)
{
if ($oldName !== null && ($newName = $item->getName()) !== $oldName) // name changed
{
if ($oldName !== null && ($newName = $item->getName()) !== $oldName) { // name changed
if (isset($this->_items[$newName])) {
throw new InvalidParamException("Unable to change the item name. The name '$newName' is already used by another item.");
}