Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 42256b2

Browse files
PMA_DBI_select_db --> PMA_DBI_selectDb
1 parent 85e16d8 commit 42256b2

39 files changed

Lines changed: 61 additions & 61 deletions

db_datadict.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
/**
5757
* Selects the database and gets tables names
5858
*/
59-
PMA_DBI_select_db($db);
59+
PMA_DBI_selectDb($db);
6060
$tables = PMA_DBI_getTables($db);
6161

6262
$count = 0;
@@ -76,7 +76,7 @@
7676
* Gets table keys and retains them
7777
*/
7878

79-
PMA_DBI_select_db($db);
79+
PMA_DBI_selectDb($db);
8080
$indexes = PMA_DBI_getTableIndexes($db, $table);
8181
$primary = '';
8282
$indexes = array();

db_operations.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
PMA_runProcedureAndFunctionDefinitions($db);
6363

6464
// go back to current db, just in case
65-
PMA_DBI_select_db($db);
65+
PMA_DBI_selectDb($db);
6666

6767
$tables_full = PMA_DBI_getTablesFull($db);
6868

@@ -109,7 +109,7 @@
109109
}
110110

111111
// go back to current db, just in case
112-
PMA_DBI_select_db($db);
112+
PMA_DBI_selectDb($db);
113113

114114
// Duplicate the bookmarks for this db (done once for each db)
115115
PMA_duplicateBookmarks($_error, $db);

export.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,7 @@ function PMA_exportOutputHandler($line)
832832
$sql_query = preg_replace('%;\s*$%', '', $sql_query);
833833
}
834834
$local_query = $sql_query . $add_query;
835-
PMA_DBI_select_db($db);
835+
PMA_DBI_selectDb($db);
836836
} else {
837837
$local_query = 'SELECT * FROM ' . PMA_Util::backquote($db)
838838
. '.' . PMA_Util::backquote($table) . $add_query;

import.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181

182182

183183
if (strlen($db)) {
184-
PMA_DBI_select_db($db);
184+
PMA_DBI_selectDb($db);
185185
}
186186

187187
@set_time_limit($cfg['ExecTimeLimit']);

libraries/DBQbe.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ private function _getIndexes($all_tables, $all_columns,
10651065
private function _getLeftJoinColumnCandidates($all_tables, $all_columns,
10661066
$where_clause_columns
10671067
) {
1068-
PMA_DBI_select_db($this->_db);
1068+
PMA_DBI_selectDb($this->_db);
10691069
$candidate_columns = array();
10701070

10711071
// Get unique columns and index columns

libraries/Table.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
748748

749749
// Doing a select_db could avoid some problems with replicated databases,
750750
// when moving table from replicated one to not replicated one
751-
PMA_DBI_select_db($target_db);
751+
PMA_DBI_selectDb($target_db);
752752

753753
$target = PMA_Util::backquote($target_db) . '.' . PMA_Util::backquote($target_table);
754754

@@ -936,7 +936,7 @@ static public function moveCopy($source_db, $source_table, $target_db,
936936

937937
// This could avoid some problems with replicated databases, when
938938
// moving table from replicated one to not replicated one
939-
PMA_DBI_select_db($source_db);
939+
PMA_DBI_selectDb($source_db);
940940

941941
if (PMA_Table::isView($source_db, $source_table)) {
942942
$sql_drop_query = 'DROP VIEW';
@@ -1201,7 +1201,7 @@ function rename($new_name, $new_db = null)
12011201
if (! PMA_DBI_query($GLOBALS['sql_query'])) {
12021202
// Restore triggers in the old database
12031203
if ($handle_triggers) {
1204-
PMA_DBI_select_db($this->getDbName());
1204+
PMA_DBI_selectDb($this->getDbName());
12051205
foreach ($triggers as $trigger) {
12061206
PMA_DBI_query($trigger['create']);
12071207
}

libraries/db_common.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
if (! isset($is_db) || ! $is_db) {
3838
if (strlen($db)) {
39-
$is_db = PMA_DBI_select_db($db);
39+
$is_db = PMA_DBI_selectDb($db);
4040
// This "Command out of sync" 2014 error may happen, for example
4141
// after calling a MySQL procedure; at this point we can't select
4242
// the db but it's not necessarily wrong

libraries/db_table_exists.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
if (empty($is_db)) {
1414
if (strlen($db)) {
15-
$is_db = @PMA_DBI_select_db($db);
15+
$is_db = @PMA_DBI_selectDb($db);
1616
} else {
1717
$is_db = false;
1818
}

libraries/dbi/drizzle.dbi.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function PMA_DBI_connect($user, $password, $is_controluser = false,
165165
*
166166
* @return bool
167167
*/
168-
function PMA_DBI_select_db($dbname, $link = null)
168+
function PMA_DBI_selectDb($dbname, $link = null)
169169
{
170170
if (empty($link)) {
171171
if (isset($GLOBALS['userlink'])) {

libraries/dbi/dummy.lib.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ function PMA_DBI_connect(
302302
*
303303
* @return bool
304304
*/
305-
function PMA_DBI_select_db($dbname, $link = null)
305+
function PMA_DBI_selectDb($dbname, $link = null)
306306
{
307307
$GLOBALS['dummy_db'] = $dbname;
308308
return true;

0 commit comments

Comments
 (0)