RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

fixed E_STRICT issues

Browse source
This commit is contained in:
zYne 2007-06-10 19:17:26 +00:00
parent 6d8003c32e
commit 6ea281f1d9
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Doctrine/Adapter/Mock.php
View file

@ -157,4 +157,6 @@ class Doctrine_Adapter_Mock implements Doctrine_Adapter_Interface, Countable
{ {
} }
public function sqliteCreateFunction()
{ }
} }

2
lib/Doctrine/Export/Oracle.php
View file

@ -203,7 +203,7 @@ END;
* *
* @return void * @return void
*/ */
public function createTable($name, $fields, $options = array()) public function createTable($name, array $fields, array $options = array())
{ {
$this->conn->beginTransaction(); $this->conn->beginTransaction();

2
lib/Doctrine/Expression/Mssql.php
View file

@ -72,7 +72,7 @@ class Doctrine_Expression_Mssql extends Doctrine_Expression
* @param string $values... * @param string $values...
* @return string to concatenate two strings * @return string to concatenate two strings
*/ */
public function concat($arg1, $arg2) public function concat()
{ {
$args = func_get_args(); $args = func_get_args();
return '(' . implode(' + ', $args) . ')'; return '(' . implode(' + ', $args) . ')';

6
lib/Doctrine/Import/Firebird.php
View file

@ -37,7 +37,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import
* *
* @return array data array * @return array data array
*/ */
public function listTables() public function listTables($database = null)
{ {
$query = 'SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG=0 AND RDB$VIEW_BLR IS NULL'; $query = 'SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG=0 AND RDB$VIEW_BLR IS NULL';
@ -71,7 +71,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import
* *
* @return array data array containing all database views * @return array data array containing all database views
*/ */
public function listViews() public function listViews($database = null)
{ {
return $this->conn->fetchColumn('SELECT DISTINCT RDB$VIEW_NAME FROM RDB$VIEW_RELATIONS'); return $this->conn->fetchColumn('SELECT DISTINCT RDB$VIEW_NAME FROM RDB$VIEW_RELATIONS');
} }
@ -108,7 +108,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import
* previous database to query against. * previous database to query against.
* @return array data array containing all triggers for given table * @return array data array containing all triggers for given table
*/ */
public function listTableTriggers($table = null) public function listTableTriggers($table)
{ {
$query = 'SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS WHERE RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0'; $query = 'SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS WHERE RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0';