diff --git a/lib/dml/adodb_moodle_database.php b/lib/dml/adodb_moodle_database.php index 5b9a67ecfe3..8117853dffd 100644 --- a/lib/dml/adodb_moodle_database.php +++ b/lib/dml/adodb_moodle_database.php @@ -93,18 +93,14 @@ abstract class adodb_moodle_database extends moodle_database { * Return tables in database WITHOUT current prefix * @return array of table names in lowercase and without prefix */ - public function get_tables($prefix=null) { + public function get_tables() { $metatables = $this->adodb->MetaTables(); $tables = array(); - if (is_null($prefix)) { - $prefix = $this->prefix; - } - foreach ($metatables as $table) { $table = strtolower($table); - if (empty($prefix) || strpos($table, $prefix) === 0) { - $tablename = substr($table, strlen($prefix)); + if (empty($this->prefix) || strpos($table, $this->prefix) === 0) { + $tablename = substr($table, strlen($this->prefix)); $tables[$tablename] = $tablename; } } diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php index f2b17338c8f..8539eba4481 100644 --- a/lib/dml/moodle_database.php +++ b/lib/dml/moodle_database.php @@ -438,7 +438,7 @@ abstract class moodle_database { * Return tables in database WITHOUT current prefix * @return array of table names in lowercase and without prefix */ - public abstract function get_tables($prefix=null); + public abstract function get_tables(); /** * Return table indexes - everything lowercased diff --git a/lib/dml/sqlite3_pdo_moodle_database.php b/lib/dml/sqlite3_pdo_moodle_database.php index 375429e4d7c..48acd769605 100644 --- a/lib/dml/sqlite3_pdo_moodle_database.php +++ b/lib/dml/sqlite3_pdo_moodle_database.php @@ -108,13 +108,9 @@ class sqlite3_pdo_moodle_database extends pdo_moodle_database { * Return tables in database WITHOUT current prefix * @return array of table names in lowercase and without prefix */ - public function get_tables($prefix=null) { + public function get_tables() { $tables = array(); - if (is_null($prefix)) { - $prefix = $this->prefix; - } - $sql = 'SELECT name FROM sqlite_master WHERE type="table" UNION ALL SELECT name FROM sqlite_temp_master WHERE type="table" ORDER BY name'; if ($this->debug) { $this->debug_query($sql); @@ -123,8 +119,8 @@ class sqlite3_pdo_moodle_database extends pdo_moodle_database { foreach ($rstables as $table) { $table = $table['name']; $table = strtolower($table); - if (empty($prefix) || strpos($table, $prefix) === 0) { - $table = substr($table, strlen($prefix)); + if (empty($this->prefix) || strpos($table, $this->prefix) === 0) { + $table = substr($table, strlen($this->prefix)); $tables[$table] = $table; } }