Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libraries/config/setup.forms.php2
-rw-r--r--libraries/config/user_preferences.forms.php2
-rw-r--r--libraries/controllers/TableIndexesController.class.php2
-rw-r--r--libraries/controllers/TableRelationController.class.php6
-rw-r--r--tbl_chart.php6
-rw-r--r--tbl_gis_visualization.php10
-rw-r--r--tbl_indexes.php18
-rw-r--r--tbl_relation.php38
-rw-r--r--test/libraries/sql-formatter/lib/SqlFormatter_test.php74
9 files changed, 79 insertions, 79 deletions
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index a615488496..304919c940 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -295,7 +295,7 @@ $forms['Export']['Export_defaults'] = array('Export' => array(
'compression',
'charset',
'lock_tables',
- 'as_separate_files',
+ 'as_separate_files',
'asfile' => ':group',
'onserver',
'onserver_overwrite',
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index a272d4857d..c150905a6e 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -194,7 +194,7 @@ $forms['Export']['Export_defaults'] = array(
'Export/compression',
'Export/charset',
'Export/lock_tables',
- 'Export/as_separate_files',
+ 'Export/as_separate_files',
'Export/asfile' => ':group',
'Export/onserver',
'Export/onserver_overwrite',
diff --git a/libraries/controllers/TableIndexesController.class.php b/libraries/controllers/TableIndexesController.class.php
index cdd4d2c3ac..c5093dea7c 100644
--- a/libraries/controllers/TableIndexesController.class.php
+++ b/libraries/controllers/TableIndexesController.class.php
@@ -35,7 +35,7 @@ class TableIndexesController extends TableController
{
parent::__construct();
- $this->index = $index;
+ $this->index = $index;
}
public function indexAction()
diff --git a/libraries/controllers/TableRelationController.class.php b/libraries/controllers/TableRelationController.class.php
index dd4766a5ec..ff88220d33 100644
--- a/libraries/controllers/TableRelationController.class.php
+++ b/libraries/controllers/TableRelationController.class.php
@@ -78,7 +78,7 @@ class TableRelationController extends TableController
protected $upd_query;
public function __construct($options_array, $cfgRelation, $tbl_storage_engine,
- $existrel, $existrel_foreign, $disp, $upd_query
+ $existrel, $existrel_foreign, $disp, $upd_query
) {
parent::__construct();
@@ -86,8 +86,8 @@ class TableRelationController extends TableController
$this->cfgRelation = $cfgRelation;
$this->tbl_storage_engine = $tbl_storage_engine;
$this->existrel = $existrel;
- $this->existrel_foreign = $existrel_foreign;
- $this->disp = $disp;
+ $this->existrel_foreign = $existrel_foreign;
+ $this->disp = $disp;
$this->upd_query = $upd_query;
}
diff --git a/tbl_chart.php b/tbl_chart.php
index 4e9c2ab839..6c7fdf6fa1 100644
--- a/tbl_chart.php
+++ b/tbl_chart.php
@@ -17,9 +17,9 @@ $container->alias('TableChartController', 'PMA\Controllers\Table\TableChartContr
/* Define dependencies for the concerned controller */
$dependency_definitions = array(
- "sql_query" => &$GLOBALS['sql_query'],
- "url_query" => &$GLOBALS['url_query'],
- "cfg" => &$GLOBALS['cfg']
+ "sql_query" => &$GLOBALS['sql_query'],
+ "url_query" => &$GLOBALS['url_query'],
+ "cfg" => &$GLOBALS['cfg']
);
/** @var Controllers\Table\TableChartController $controller */
diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 4bafe39ad4..e369fca8c8 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -20,11 +20,11 @@ $container->alias('TableGisVisualizationController', 'PMA\Controllers\Table\Tabl
/* Define dependencies for the concerned controller */
$dependency_definitions = array(
- "sql_query" => &$GLOBALS['sql_query'],
- "url_params" => &$GLOBALS['url_params'],
- "goto" => PMA_Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database'),
- "back" => 'sql.php',
- "visualizationSettings" => array()
+ "sql_query" => &$GLOBALS['sql_query'],
+ "url_params" => &$GLOBALS['url_params'],
+ "goto" => PMA_Util::getScriptNameForOption($GLOBALS['cfg']['DefaultTabDatabase'], 'database'),
+ "back" => 'sql.php',
+ "visualizationSettings" => array()
);
/** @var Controllers\Table\TableGisVisualizationController $controller */
diff --git a/tbl_indexes.php b/tbl_indexes.php
index f2bef4fcb5..d2490bd168 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -24,21 +24,21 @@ $table = $container->get('table');
$dbi = $container->get('dbi');
if (!isset($_REQUEST['create_edit_table'])) {
- include_once 'libraries/tbl_common.inc.php';
+ include_once 'libraries/tbl_common.inc.php';
}
if (isset($_REQUEST['index'])) {
- if (is_array($_REQUEST['index'])) {
- // coming already from form
- $index = new PMA_Index($_REQUEST['index']);
- } else {
- $index = $dbi->getTable($db, $table)->getIndex($_REQUEST['index']);
- }
+ if (is_array($_REQUEST['index'])) {
+ // coming already from form
+ $index = new PMA_Index($_REQUEST['index']);
+ } else {
+ $index = $dbi->getTable($db, $table)->getIndex($_REQUEST['index']);
+ }
} else {
- $index = new PMA_Index;
+ $index = new PMA_Index;
}
$dependency_definitions = array(
- "index" => $index
+ "index" => $index
);
/** @var Controllers\Table\TableIndexesController $controller */
diff --git a/tbl_relation.php b/tbl_relation.php
index 349e59768c..f58d7168c3 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -36,38 +36,38 @@ $db = $container->get('db');
$table = $container->get('table');
$dbi = $container->get('dbi');
$options_array = array(
- 'CASCADE' => 'CASCADE',
- 'SET_NULL' => 'SET NULL',
- 'NO_ACTION' => 'NO ACTION',
- 'RESTRICT' => 'RESTRICT',
+ 'CASCADE' => 'CASCADE',
+ 'SET_NULL' => 'SET NULL',
+ 'NO_ACTION' => 'NO ACTION',
+ 'RESTRICT' => 'RESTRICT',
);
$cfgRelation = PMA_getRelationsParam();
$tbl_storage_engine = /*overload*/
- mb_strtoupper(
- PMA_Table::sGetStatusInfo(
- $db,
- $table,
- 'Engine'
- )
- );
+ mb_strtoupper(
+ PMA_Table::sGetStatusInfo(
+ $db,
+ $table,
+ 'Engine'
+ )
+ );
$upd_query = new PMA_Table($table, $db, $dbi);
$dependency_definitions = array(
- "options_array" => $options_array,
- "cfgRelation" => $cfgRelation,
- "tbl_storage_engine" => $tbl_storage_engine,
- "upd_query" => $upd_query
+ "options_array" => $options_array,
+ "cfgRelation" => $cfgRelation,
+ "tbl_storage_engine" => $tbl_storage_engine,
+ "upd_query" => $upd_query
);
if ($cfgRelation['relwork']) {
- $dependency_definitions['existrel'] = PMA_getForeigners($db, $table, '', 'internal');
+ $dependency_definitions['existrel'] = PMA_getForeigners($db, $table, '', 'internal');
}
if (PMA_Util::isForeignKeySupported($tbl_storage_engine)) {
- $dependency_definitions['existrel_foreign'] = PMA_getForeigners($db, $table, '', 'foreign');
+ $dependency_definitions['existrel_foreign'] = PMA_getForeigners($db, $table, '', 'foreign');
}
if ($cfgRelation['displaywork']) {
- $dependency_definitions['disp'] = PMA_getDisplayField($db, $table);
+ $dependency_definitions['disp'] = PMA_getDisplayField($db, $table);
} else {
- $dependency_definitions['disp'] = 'asas';
+ $dependency_definitions['disp'] = 'asas';
}
/** @var Controllers\Table\TableRelationController $controller */
diff --git a/test/libraries/sql-formatter/lib/SqlFormatter_test.php b/test/libraries/sql-formatter/lib/SqlFormatter_test.php
index 7412e1e87a..d30a85c0c0 100644
--- a/test/libraries/sql-formatter/lib/SqlFormatter_test.php
+++ b/test/libraries/sql-formatter/lib/SqlFormatter_test.php
@@ -28,9 +28,9 @@ class SqlFormatter_Test extends PHPUnit_Framework_TestCase
array(
"SELECT * FROM `test`",
"SELECT
- *
+ *
FROM
- `test`",
+ `test`",
),
array(
@@ -38,45 +38,45 @@ array(
INNER JOIN orders ON customers.customer_id = orders.customer_id GROUP BY customer_id,
customer_name HAVING COUNT(order_id) > 5 ORDER BY COUNT(order_id) DESC;",
"SELECT
- customer_id,
- customer_name,
- COUNT(order_id) as total
+ customer_id,
+ customer_name,
+ COUNT(order_id) as total
FROM
- customers
- INNER JOIN orders ON customers.customer_id = orders.customer_id
+ customers
+ INNER JOIN orders ON customers.customer_id = orders.customer_id
GROUP BY
- customer_id,
- customer_name
+ customer_id,
+ customer_name
HAVING
- COUNT(order_id) > 5
+ COUNT(order_id) > 5
ORDER BY
- COUNT(order_id) DESC;"
+ COUNT(order_id) DESC;"
),
array(
"SELECT a,b as c FROM `ab`; UPDATE `cd` SET `col` = REPLACE(col, 'find', 'replace')
WHERE row_id in (SELECT row_id FROM new_table WHERE col = 's' AND col2 = '3') LIMIT 256",
"SELECT
- a,
- b as c
+ a,
+ b as c
FROM
- `ab`;
+ `ab`;
UPDATE
- `cd`
+ `cd`
SET
- `col` = REPLACE(col, 'find', 'replace')
+ `col` = REPLACE(col, 'find', 'replace')
WHERE
- row_id in (
- SELECT
- row_id
- FROM
- new_table
- WHERE
- col = 's'
- AND col2 = '3'
- )
+ row_id in (
+ SELECT
+ row_id
+ FROM
+ new_table
+ WHERE
+ col = 's'
+ AND col2 = '3'
+ )
LIMIT
- 256"
+ 256"
),
array(
@@ -85,29 +85,29 @@ array(
VALUES (1, 0, '', 1, NOW(), NOW(), 0),
(1, 0, 'helloabcdefgijk', 1, 'hello_world_again', NOW(), 0)",
"INSERT INTO `a_long_table_name_it_is_really_log_but_still_not_that_long` (
- a, b, c, d, e, f, g, a, b, c, d, e, f, c, d, e
+ a, b, c, d, e, f, g, a, b, c, d, e, f, c, d, e
)
VALUES
- (1, 0, '', 1, NOW(), NOW(), 0),
- (
- 1, 0, 'helloabcdefgijk', 1, 'hello_world_again',
- NOW(), 0
- )"
+ (1, 0, '', 1, NOW(), NOW(), 0),
+ (
+ 1, 0, 'helloabcdefgijk', 1, 'hello_world_again',
+ NOW(), 0
+ )"
),
array(
"ALTER TABLE `PREFIX_product` DROP `reduction_price`,DROP `reduction_percent`,
DROP `reduction_from`, DROP `reduction_to`",
"ALTER TABLE
- `PREFIX_product`
+ `PREFIX_product`
DROP
- `reduction_price`,
+ `reduction_price`,
DROP
- `reduction_percent`,
+ `reduction_percent`,
DROP
- `reduction_from`,
+ `reduction_from`,
DROP
- `reduction_to`"
+ `reduction_to`"
),
);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 12:51:55 +0300