RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-13 06:46:03 +03:00
Code Issues Projects Releases Wiki Activity

[2.0] Refactorings

Browse Source
This commit is contained in:
romanb 2009-05-30 14:10:01 +00:00
parent 548e07467e
commit 9586b748a8
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Doctrine/DBAL/Schema/AbstractSchemaManager.php
View File

@ -265,7 +265,7 @@ abstract class AbstractSchemaManager
// $table == $index ??? // $table == $index ???
$sql = $this->_platform->getDropIndexSql($table, $name); $sql = $this->_platform->getDropIndexSql($table, $name);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -280,7 +280,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getDropConstraintSql($table, $name, $primary); $sql = $this->_platform->getDropConstraintSql($table, $name, $primary);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -294,7 +294,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getDropForeignKeySql($table, $name); $sql = $this->_platform->getDropForeignKeySql($table, $name);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -307,7 +307,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getDropSequenceSql($name); $sql = $this->_platform->getDropSequenceSql($name);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -316,14 +316,11 @@ abstract class AbstractSchemaManager
* @param string $database The name of the database to create * @param string $database The name of the database to create
* @return boolean $result * @return boolean $result
*/ */
public function createDatabase($database = null) public function createDatabase($database)
{ {
if (is_null($database)) {
$database = $this->_conn->getDatabase();
}
$sql = $this->_platform->getCreateDatabaseSql($database); $sql = $this->_platform->getCreateDatabaseSql($database);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -352,7 +349,7 @@ abstract class AbstractSchemaManager
$sql = $this->_platform->getCreateTableSql($name, $columns, $options); $sql = $this->_platform->getCreateTableSql($name, $columns, $options);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -373,7 +370,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getCreateSequenceSql($seqName, $start, $options); $sql = $this->_platform->getCreateSequenceSql($seqName, $start, $options);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -401,7 +398,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getCreateConstraintSql($table, $name, $definition); $sql = $this->_platform->getCreateConstraintSql($table, $name, $definition);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -439,7 +436,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getCreateIndexSql($table, $name, $definition); $sql = $this->_platform->getCreateIndexSql($table, $name, $definition);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -453,7 +450,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getCreateForeignKeySql($table, $definition); $sql = $this->_platform->getCreateForeignKeySql($table, $definition);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -467,7 +464,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getCreateViewSql($name, $sql); $sql = $this->_platform->getCreateViewSql($name, $sql);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -480,7 +477,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getDropViewSql($name); $sql = $this->_platform->getDropViewSql($name);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -575,7 +572,7 @@ abstract class AbstractSchemaManager
{ {
$sql = $this->_platform->getAlterTableSql($name, $changes, $check); $sql = $this->_platform->getAlterTableSql($name, $changes, $check);
return $this->_executeSql($sql, 'exec'); return $this->_execSql($sql);
} }
/** /**
@ -856,11 +853,20 @@ abstract class AbstractSchemaManager
return $tableForeignKey; return $tableForeignKey;
} }
protected function _executeSql($sql, $method = 'exec') protected function _executeSql($sql)
{ {
$result = true; $result = true;
foreach ((array) $sql as $query) { foreach ((array) $sql as $query) {
$result = $this->_conn->$method($query); $result = $this->_conn->execute($query);
}
return $result;
}
protected function _execSql($sql)
{
$result = true;
foreach ((array) $sql as $query) {
$result = $this->_conn->exec($query);
} }
return $result; return $result;
} }