RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2024-12-14 15:16:04 +03:00
Code Issues Projects Releases Wiki Activity

fixed some more E_STRICT issues

Browse Source
This commit is contained in:
zYne 2007-06-10 19:20:40 +00:00
parent 6ea281f1d9
commit 1238a5000a
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/Export/Mssql.php
View File

@ -150,7 +150,7 @@ class Doctrine_Export_Mssql extends Doctrine_Export
* actually perform them otherwise.
* @return void
*/
public function alterTable($name, $changes, $check)
public function alterTable($name, array $changes, $check)
{
foreach ($changes as $changeName => $change) {
switch ($changeName) {

5
lib/Doctrine/Expression/Oracle.php
View File

@ -41,12 +41,11 @@ class Doctrine_Expression_Oracle extends Doctrine_Expression
* @param string $arg1, $arg2 ... $argN strings that will be concatinated.
* @return string
*/
public function concat($arg1, $arg2)
public function concat()
{
$args = func_get_args();
$cols = $this->getIdentifiers( $args );
return join( ' || ' , $cols );
return join(' || ' , $args);
}
/**
* return string to call a function to get a substring inside an SQL statement

5
lib/Doctrine/Expression/Pgsql.php
View File

@ -92,12 +92,11 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
* @param string|array(string) strings that will be concatinated.
* @return string
*/
public function concat($arg1, $arg2)
public function concat()
{
$args = func_get_args();
$cols = $this->getIdentifiers($cols);
return join(' || ' , $cols);
return join(' || ' , $args);
}
/**
* Returns the SQL string to return the current system date and time.

2
lib/Doctrine/Import/Mssql.php
View File

@ -115,7 +115,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import
*
* @return array
*/
public function listTriggers()
public function listTriggers($database = null)
{
$query = "SELECT name FROM sysobjects WHERE xtype = 'TR'";