';
- if ($propertyGroup->getText() != null) {
- $ret .= '
' . PMA_getString($propertyGroup->getText()) . '
'; + + if (method_exists($propertyGroup, 'getText')) { + $text = $propertyGroup->getText(); + } + + if ($text != null) { + $ret .= '' . PMA_getString($text) . '
'; } $ret .= '- ';
}
@@ -447,17 +453,20 @@ function PMA_pluginGetOptions($section, &$list)
$default = PMA_pluginGetDefault('Export', 'format');
// Options for plugins that support them
foreach ($list as $plugin) {
+ $properties = $plugin->getProperties();
+ if ($properties != null) {
+ $text = $properties->getText();
+ $options = $properties->getOptions();
+ }
+
$plugin_name = strtolower(substr(get_class($plugin), strlen($section)));
$ret .= '
';
- $ret .= '
' - . __('MySQL said: ') . PMA_DBI_getError(null); + $errors[] = sprintf( + __('The following query has failed: "%s"'), + htmlspecialchars($item_query) + ) + . '
' + . __('MySQL said: ') . PMA_DBI_getError(null); } else { $message = PMA_Message::success(__('Trigger %1$s has been created.')); $message->addParam(PMA_CommonFunctions::getInstance()->backquote($_REQUEST['item_name'])); @@ -325,7 +329,9 @@ function PMA_TRI_getEditorForm($mode, $item) } else if ($mode == 'edit' && $value == $item['item_table']) { $selected = " selected='selected'"; } - $retval .= "$value\n";
+ $retval .= "";
+ $retval .= htmlspecialchars($value);
+ $retval .= "\n";
}
$retval .= " \n";
$retval .= " \n";
diff --git a/po/fa.po b/po/fa.po
index ba20af2b15..a9cfaaa97f 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -4,10 +4,10 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.0.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
"POT-Creation-Date: 2012-08-10 12:59+0200\n"
-"PO-Revision-Date: 2012-08-03 00:13+0200\n"
+"PO-Revision-Date: 2012-08-11 04:26+0200\n"
"Last-Translator: Ashiyane Digital Security Team \n"
-"Language-Team: Persian \n"
+"Language-Team: Persian "
+"\n"
-"Language-Team: brazilian_portuguese \n"
+"PO-Revision-Date: 2012-08-10 22:16+0200\n"
+"Last-Translator: gilberto dos santos alves \n"
+"Language-Team: Portuguese (Brazil) "
+"\n"
-"Language-Team: Chinese (China)
+
-
' . PMA_getString($plugin->getProperties()->getText()) - . '
'; + $ret .= '' . PMA_getString($text) . '
'; $no_options = true; - if ($plugin->getProperties()->getOptions() != null - && count($plugin->getProperties()->getOptions()) > 0 - ) { - foreach ($plugin->getProperties()->getOptions()->getProperties() + if ($options != null && count($options) > 0) { + foreach ($options->getProperties() as $propertyMainGroup ) { // check for hidden properties diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index 9a0a38add6..305a830100 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -693,20 +693,24 @@ class ExportSql extends ExportPlugin global $crlf; $common_functions = PMA_CommonFunctions::getInstance(); - + if (isset($GLOBALS['sql_compatibility'])) { + $compat = $GLOBALS['sql_compatibility']; + } else { + $compat = 'NONE'; + } if (isset($GLOBALS['sql_drop_database'])) { if (! PMA_exportOutputHandler( 'DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) - ? $common_functions->backquote($db) : $db) + ? $common_functions->backquote_compat($db, $compat) : $db) . ';' . $crlf )) { return false; } } $create_query = 'CREATE DATABASE ' - . (isset($GLOBALS['sql_backquotes']) - ? $common_functions->backquote($db) : $db); + . (isset($GLOBALS['sql_backquotes']) + ? $common_functions->backquote_compat($db, $compat) : $db); $collation = PMA_getDbCollation($db); if (PMA_DRIZZLE) { $create_query .= ' COLLATE ' . $collation; @@ -729,7 +733,8 @@ class ExportSql extends ExportPlugin || PMA_DRIZZLE) ) { $result = PMA_exportOutputHandler( - 'USE ' . $common_functions->backquote($db) . ';' . $crlf + 'USE ' . $common_functions->backquote_compat($db, $compat) + . ';' . $crlf ); } else { $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf); @@ -747,11 +752,16 @@ class ExportSql extends ExportPlugin */ public function exportDBHeader($db) { + if (isset($GLOBALS['sql_compatibility'])) { + $compat = $GLOBALS['sql_compatibility']; + } else { + $compat = 'NONE'; + } $head = $this->_exportComment() . $this->_exportComment( __('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) - ? PMA_CommonFunctions::getInstance()->backquote($db) + ? PMA_CommonFunctions::getInstance()->backquote_compat($db, $compat) : '\'' . $db . '\'') ) . $this->_exportComment(); @@ -893,6 +903,12 @@ class ExportSql extends ExportPlugin $auto_increment = ''; $new_crlf = $crlf; + if (isset($GLOBALS['sql_compatibility'])) { + $compat = $GLOBALS['sql_compatibility']; + } else { + $compat = 'NONE'; + } + // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli $result = PMA_DBI_query( 'SHOW TABLE STATUS FROM ' . $common_functions->backquote($db) @@ -1040,7 +1056,8 @@ class ExportSql extends ExportPlugin } // Should we use IF NOT EXISTS? - if (isset($GLOBALS['sql_if_not_exists'])) { + // It always must be OFF for MSSQL compatibility mode + if (isset($GLOBALS['sql_if_not_exists']) && $compat != 'MSSQL') { $create_query = preg_replace( '/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', @@ -1048,6 +1065,95 @@ class ExportSql extends ExportPlugin ); } + // In MSSQL + // 1. DATE field doesn't exists, we will use DATETIME instead + // 2. UNSIGNED attribute doesn't exist + // 3. No length on INT, TINYINT, SMALLINT, BIGINT and no precision on + // FLOAT fields + // 4. No KEY and INDEX inside CREATE TABLE + // 5. DOUBLE field doesn't exists, we will use FLOAT instead + if ($compat == 'MSSQL') { + // first we need to replace all lines ended with '" DATE ...,\n' + // last preg_replace preserve us from situation with date text + // inside DEFAULT field value + $create_query = preg_replace( + "/\" date DEFAULT NULL(,)?\n/", + '" datetime DEFAULT NULL$1' . "\n", + $create_query + ); + $create_query = preg_replace( + "/\" date NOT NULL(,)?\n/", + '" datetime NOT NULL$1' . "\n", + $create_query + ); + $create_query = preg_replace( + '/" date NOT NULL DEFAULT \'([^\'])/', + '" datetime NOT NULL DEFAULT \'$1', + $create_query + ); + + // next we need to replace all lines ended with ') UNSIGNED ...,' + // last preg_replace preserve us from situation with unsigned text + // inside DEFAULT field value + $create_query = preg_replace( + "/\) unsigned NOT NULL(,)?\n/", + ') NOT NULL$1' . "\n", + $create_query + ); + $create_query = preg_replace( + "/\) unsigned DEFAULT NULL(,)?\n/", + ') DEFAULT NULL$1' . "\n", + $create_query + ); + $create_query = preg_replace( + '/\) unsigned NOT NULL DEFAULT \'([^\'])/', + ') NOT NULL DEFAULT \'$1', + $create_query + ); + + // we need to replace all lines ended with + // '" INT|TINYINT([0-9]{1,}) ...,' last preg_replace preserve us + // from situation with int([0-9]{1,}) text inside DEFAULT field + // value + $create_query = preg_replace( + '/" (int|tinyint|smallint|bigint)\([0-9]+\) DEFAULT NULL(,)?\n/', + '" $1 DEFAULT NULL$2' . "\n", + $create_query + ); + $create_query = preg_replace( + '/" (int|tinyint|smallint|bigint)\([0-9]+\) NOT NULL(,)?\n/', + '" $1 NOT NULL$2' . "\n", + $create_query + ); + $create_query = preg_replace( + '/" (int|tinyint|smallint|bigint)\([0-9]+\) NOT NULL DEFAULT \'([^\'])/', + '" $1 NOT NULL DEFAULT \'$2', + $create_query + ); + + // we need to replace all lines ended with + // '" FLOAT|DOUBLE([0-9,]{1,}) ...,' + // last preg_replace preserve us from situation with + // float([0-9,]{1,}) text inside DEFAULT field value + $create_query = preg_replace( + '/" (float|double)(\([0-9]+,[0-9,]+\))? DEFAULT NULL(,)?\n/', + '" float DEFAULT NULL$3' . "\n", + $create_query + ); + $create_query = preg_replace( + '/" (float|double)(\([0-9,]+,[0-9,]+\))? NOT NULL(,)?\n/', + '" float NOT NULL$3' . "\n", + $create_query + ); + $create_query = preg_replace( + '/" (float|double)(\([0-9,]+,[0-9,]+\))? NOT NULL DEFAULT \'([^\'])/', + '" float NOT NULL DEFAULT \'$3', + $create_query + ); + + // @todo remove indexes from CREATE TABLE + } + // Drizzle (checked on 2011.03.13) returns ROW_FORMAT surrounded // with quotes, which is not accepted by parser if (PMA_DRIZZLE) { @@ -1107,19 +1213,22 @@ class ExportSql extends ExportPlugin . $this->_exportComment( __('Constraints for table') . ' ' - . $common_functions->backquote($table) + . $common_functions->backquote_compat($table, $compat) ) . $this->_exportComment(); } // let's do the work $sql_constraints_query .= 'ALTER TABLE ' - . $common_functions->backquote($table) . $crlf; + . $common_functions->backquote_compat($table, $compat) + . $crlf; $sql_constraints .= 'ALTER TABLE ' - . $common_functions->backquote($table) . $crlf; + . $common_functions->backquote_compat($table, $compat) + . $crlf; $sql_drop_foreign_keys .= 'ALTER TABLE ' - . $common_functions->backquote($db) . '.' - . $common_functions->backquote($table) . $crlf; + . $common_functions->backquote_compat($db, $compat) . '.' + . $common_functions->backquote_compat($table, $compat) + . $crlf; $first = true; for ($j = $i; $j < $sql_count; $j++) { @@ -1190,7 +1299,7 @@ class ExportSql extends ExportPlugin $schema_create ); - $schema_create .= $auto_increment; + $schema_create .= ($compat != 'MSSQL') ? $auto_increment : ''; PMA_DBI_free_result($result); return $schema_create . ($add_semicolon ? ';' . $crlf : ''); @@ -1335,9 +1444,14 @@ class ExportSql extends ExportPlugin ) { $common_functions = PMA_CommonFunctions::getInstance(); + if (isset($GLOBALS['sql_compatibility'])) { + $compat = $GLOBALS['sql_compatibility']; + } else { + $compat = 'NONE'; + } $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) - ? $common_functions->backquote($table) : '\'' . $table . '\''; + ? $common_functions->backquote_compat($table, $compat) : '\'' . $table . '\''; $dump = $this->_possibleCRLF() . $this->_exportComment(str_repeat('-', 56)) . $this->_possibleCRLF() @@ -1395,7 +1509,7 @@ class ExportSql extends ExportPlugin ) . $this->_exportComment(); // export a stand-in definition to resolve view dependencies - $dump .= getTableDefStandIn($db, $table, $crlf); + $dump .= $this->getTableDefStandIn($db, $table, $crlf); } // end switch // this one is built by getTableDef() to use in table copy/move @@ -1420,9 +1534,15 @@ class ExportSql extends ExportPlugin { global $current_row, $sql_backquotes; + if (isset($GLOBALS['sql_compatibility'])) { + $compat = $GLOBALS['sql_compatibility']; + } else { + $compat = 'NONE'; + } + $common_functions = PMA_CommonFunctions::getInstance(); $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) - ? $common_functions->backquote($table) + ? $common_functions->backquote_compat($table, $compat) : '\'' . $table . '\''; // Do not export data for a VIEW @@ -1469,13 +1589,15 @@ class ExportSql extends ExportPlugin for ($j = 0; $j < $fields_cnt; $j++) { if (isset($analyzed_sql[0]['select_expr'][$j]['column'])) { - $field_set[$j] = $common_functions->backquote( + $field_set[$j] = $common_functions->backquote_compat( $analyzed_sql[0]['select_expr'][$j]['column'], + $compat, $sql_backquotes ); } else { - $field_set[$j] = $common_functions->backquote( + $field_set[$j] = $common_functions->backquote_compat( $fields_meta[$j]->name, + $compat, $sql_backquotes ); } @@ -1490,8 +1612,9 @@ class ExportSql extends ExportPlugin $schema_insert .= 'IGNORE '; } // avoid EOL blank - $schema_insert .= $common_functions->backquote( + $schema_insert .= $common_functions->backquote_compat( $table, + $compat, $sql_backquotes ) . ' SET'; } else { @@ -1524,8 +1647,9 @@ class ExportSql extends ExportPlugin && $sql_command == 'INSERT' ) { $truncate = 'TRUNCATE TABLE ' - . $common_functions->backquote( + . $common_functions->backquote_compat( $table, + $compat, $sql_backquotes ) . ";"; $truncatehead = $this->_possibleCRLF() @@ -1541,18 +1665,19 @@ class ExportSql extends ExportPlugin } else { $truncate = ''; } + // scheme for inserting fields if ($GLOBALS['sql_insert_syntax'] == 'complete' || $GLOBALS['sql_insert_syntax'] == 'both' ) { $fields = implode(', ', $field_set); $schema_insert = $sql_command . $insert_delayed .' INTO ' - . $common_functions->backquote($table, $sql_backquotes) + . $common_functions->backquote_compat($table, $compat, $sql_backquotes) // avoid EOL blank . ' (' . $fields . ') VALUES'; } else { $schema_insert = $sql_command . $insert_delayed .' INTO ' - . $common_functions->backquote($table, $sql_backquotes) + . $common_functions->backquote_compat($table, $compat, $sql_backquotes) . ' VALUES'; } } @@ -1586,6 +1711,18 @@ class ExportSql extends ExportPlugin if (! PMA_exportOutputHandler($head)) { return false; } + } + // We need to SET IDENTITY_INSERT ON for MSSQL + if (isset($GLOBALS['sql_compatibility']) + && $GLOBALS['sql_compatibility'] == 'MSSQL' + && $current_row == 0) { + if (! PMA_exportOutputHandler('SET IDENTITY_INSERT ' + . $common_functions->backquote_compat( + $table, + $compat) + . ' ON ;'.$crlf)) { + return false; + } } $current_row++; for ($j = 0; $j < $fields_cnt; $j++) { @@ -1707,14 +1844,30 @@ class ExportSql extends ExportPlugin } } // end while + if ($current_row > 0) { if (! PMA_exportOutputHandler(';' . $crlf)) { return false; } } + + // We need to SET IDENTITY_INSERT OFF for MSSQL + if (isset($GLOBALS['sql_compatibility']) + && $GLOBALS['sql_compatibility'] == 'MSSQL' + && $current_row > 0) + if (! PMA_exportOutputHandler( + $crlf . 'SET IDENTITY_INSERT ' + . $common_functions->backquote_compat( + $table, + $compat) + . ' OFF;' . $crlf + )) { + return false; + } + } // end if ($result != false) PMA_DBI_free_result($result); return true; } // end of the 'exportData()' function -} \ No newline at end of file +} diff --git a/libraries/rte/rte_triggers.lib.php b/libraries/rte/rte_triggers.lib.php index c47554a673..29290a67f8 100644 --- a/libraries/rte/rte_triggers.lib.php +++ b/libraries/rte/rte_triggers.lib.php @@ -100,8 +100,12 @@ function PMA_TRI_handleEditor() // 'Add a new item' mode $result = PMA_DBI_try_query($item_query); if (! $result) { - $errors[] = sprintf(__('The following query has failed: "%s"'), $item_query) . '' - . __('MySQL said: ') . PMA_DBI_getError(null); + $errors[] = sprintf( + __('The following query has failed: "%s"'), + htmlspecialchars($item_query) + ) + . '
' + . __('MySQL said: ') . PMA_DBI_getError(null); } else { $message = PMA_Message::success(__('Trigger %1$s has been created.')); $message->addParam(PMA_CommonFunctions::getInstance()->backquote($_REQUEST['item_name'])); @@ -325,7 +329,9 @@ function PMA_TRI_getEditorForm($mode, $item) } else if ($mode == 'edit' && $value == $item['item_table']) { $selected = " selected='selected'"; } - $retval .= "
| - | - | - | - | - | - | - | - | + | + + + - - |
+
+ onmouseout="$('.soimg').toggle()" onmouseover="$('.soimg').toggle()"
+
+ >
+
+
+
+
+ 
+
+
+
+
+
+
+
+ ; ?>text.png)
+
+
+
+ |
+
+
+
diff --git a/setup/styles.css b/setup/styles.css
index c6798c74e2..9f2d2ec943 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -176,7 +176,7 @@ div.notice {
.error {
border: 1px solid maroon !important;
color: #000;
- background: #fcf;
+ background: pink;
}
h1.error,
diff --git a/tbl_create.php b/tbl_create.php
index c202d8bb9f..3ffd2dd223 100644
--- a/tbl_create.php
+++ b/tbl_create.php
@@ -277,7 +277,9 @@ if (isset($_REQUEST['do_save_data'])) {
$new_table_string .= '' . "\n"; $new_table_string .= ' | '; - $new_table_string .= ''. $table . ''; + $new_table_string .= '' + . htmlspecialchars($table) . ''; if (PMA_Tracker::isActive()) { $truename = str_replace(' ', ' ', htmlspecialchars($table)); diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php index d47c2e5ffc..f259e879ba 100644 --- a/test/classes/PMA_DisplayResults_test.php +++ b/test/classes/PMA_DisplayResults_test.php @@ -1397,6 +1397,261 @@ class PMA_DisplayResults_test extends PHPUnit_Framework_TestCase ) ); } + + + /** + * Data provider for testIsNeedToSytaxHighlight + * + * @return array parameters and output + */ + public function dataProviderForTestIsNeedToSytaxHighlight() + { + return array( + array( + 'information_schema', + 'processlist', + array( + 'information_schema' => array( + 'processlist' => array( + 'info' => array( + 'libraries/plugins/transformations/Text_Plain_Formatted.class.php', + 'Text_Plain_Formatted', + 'Text_Plain' + ) + ) + ) + ), + 'info', + true + ), + array( + 'incorrect_database', + 'processlist', + array( + 'information_schema' => array( + 'processlist' => array( + 'info' => array( + 'libraries/plugins/transformations/Text_Plain_Formatted.class.php', + 'Text_Plain_Formatted', + 'Text_Plain' + ) + ) + ) + ), + 'info', + false + ) + ); + } + + + /** + * Test _isNeedToSytaxHighlight + * + * @param string $db the database name + * @param string $table the table name + * @param array $data predifined data of columns need to sytax highlighted + * @param string $field the field name + * @param boolean $output output of _isNeedToSytaxHighlight + * + * @dataProvider dataProviderForTestIsNeedToSytaxHighlight + */ + public function testIsNeedToSytaxHighlight($db, $table, $data, $field, $output) + { + $this->object->__set('_db', $db); + $this->object->__set('_table', $table); + $this->object->__set('sytax_highlighting_column_info', $data); + + + $this->assertEquals( + $output, + $this->_callPrivateFunction( + '_isNeedToSytaxHighlight', + array($field) + ) + ); + + } + + + /** + * Data provider for testIsFieldNeedToLink + * + * @return array parameters and output + */ + public function dataProviderForTestIsFieldNeedToLink() + { + return array( + array( + 'mysql', + 'proc', + 'db', + true + ), + array( + 'incorrect_database', + 'processlist', + 'info', + false + ) + ); + } + + + /** + * Test _isFieldNeedToLink + * + * @param string $db the database name + * @param string $table the table name + * @param string $field the field name + * @param boolean $output output of _isFieldNeedToLink + * + * @dataProvider dataProviderForTestIsFieldNeedToLink + */ + public function testIsFieldNeedToLink($db, $table, $field, $output) + { + + $GLOBALS['special_schema_links'] = array( + 'mysql' => array( + 'proc' => array( + 'db' => array( + 'link_param' => 'db', + 'default_page' => 'index.php' + ) - + ) + ) + ); + + $this->object->__set('_db', $db); + $this->object->__set('_table', $table); + + $this->assertEquals( + $output, + $this->_callPrivateFunction( + '_isFieldNeedToLink', + array($field) + ) + ); + + } + + + /** + * Data provider for testGetSpecialLinkUrl + * + * @return array parameters and output + */ + public function dataProviderForTestGetSpecialLinkUrl() + { + return array( + array( + 'information_schema', + 'routines', + 'circumference', + array( + 'routine_name' => 'circumference', + 'routine_schema' => 'data', + 'routine_type' => 'FUNCTION' + ), + 'routine_name', + 'db_routines.php?item_name=circumference&db=data&execute_dialog=1&item_type=FUNCTION&lang=en&token=token' + ), + array( + 'information_schema', + 'routines', + 'area', + array( + 'routine_name' => 'area', + 'routine_schema' => 'data', + 'routine_type' => 'PROCEDURE' + ), + 'routine_name', + 'db_routines.php?item_name=area&db=data&execute_routine=1&item_type=PROCEDURE&lang=en&token=token' + ), + array( + 'information_schema', + 'columns', + 'CHARACTER_SET_NAME', + array( + 'table_schema' => 'information_schema', + 'table_name' => 'CHARACTER_SETS' + ), + 'column_name', + 'index.php?sql_query=SELECT+%60CHARACTER_SET_NAME%60+FROM+%60information_schema%60.%60CHARACTER_SETS%60&db=information_schema&test_name=value&lang=en&token=token' + ) + ); + } + + + /** + * Test _getSpecialLinkUrl + * + * @param string $db the database name + * @param string $table the table name + * @param string $column_value column value + * @param array $row_info information about row + * @param string $field_name column name + * @param boolean $output output of _getSpecialLinkUrl + * + * @dataProvider dataProviderForTestGetSpecialLinkUrl + */ + public function testGetSpecialLinkUrl( + $db, $table, $column_value, $row_info, $field_name, $output + ) { + + $GLOBALS['special_schema_links'] = array( + 'information_schema' => array( + 'routines' => array( + 'routine_name' => array( + 'link_param' => 'item_name', + 'link_dependancy_params' => array( + 0 => array( + 'param_info' => 'db', + 'column_name' => 'routine_schema' + ), + 1 => array( + 'param_info' => 'item_type', + 'column_name' => 'routine_type' + ) + ), + 'default_page' => 'db_routines.php' + ) + ), + 'columns' => array( + 'column_name' => array( + 'link_param' => array( + 'sql_query', + 'table_schema', + 'table_name' + ), + 'link_dependancy_params' => array( + 0 => array( + 'param_info' => 'db', + 'column_name' => 'table_schema' + ), + 1 => array( + 'param_info' => array('test_name', 'value') + ) + ), + 'default_page' => 'index.php' + ) + ) + ) + ); + + $this->object->__set('_db', $db); + $this->object->__set('_table', $table); + + $this->assertEquals( + $output, + $this->_callPrivateFunction( + '_getSpecialLinkUrl', + array($column_value, $row_info, $field_name) + ) + ); + + } + + } diff --git a/test/libraries/common/PMA_quoting_slashing_test.php b/test/libraries/common/PMA_quoting_slashing_test.php index 151273a1c4..2c69693827 100644 --- a/test/libraries/common/PMA_quoting_slashing_test.php +++ b/test/libraries/common/PMA_quoting_slashing_test.php @@ -114,6 +114,41 @@ class PMA_quoting_slashing_test extends PHPUnit_Framework_TestCase $this->assertEquals($b, PMA_CommonFunctions::getInstance()->backquote($a)); } + /** + * data provider for backquote_compat test + * + * @return array + */ + public function backquote_compatDataProvider() + { + return array( + array('0', '"0"'), + array('test', '"test"'), + array('te`st', '"te`st"'), + array(array('test', 'te`st', '', '*'), array('"test"', '"te`st"', '', '*')) + ); + } + + /** + * backquote_compat test with different param $compatibility (NONE, MSSQL) + * @dataProvider backquote_compatDataProvider + */ + public function testBackquote_compat($a, $b) + { + // Test bypass quoting (used by dump functions) + $this->assertEquals($a, PMA_CommonFunctions::getInstance()->backquote_compat($a, 'NONE', false)); + + // Test backquote (backquoting will be enabled only if isset $GLOBALS['sql_backquotes'] + $this->assertEquals($a, PMA_CommonFunctions::getInstance()->backquote_compat($a, 'NONE')); + + // Run tests in MSSQL compatibility mode + // Test bypass quoting (used by dump functions) + $this->assertEquals($a, PMA_CommonFunctions::getInstance()->backquote_compat($a, 'MSSQL', false)); + + // Test backquote + $this->assertEquals($b, PMA_CommonFunctions::getInstance()->backquote_compat($a, 'MSSQL')); + } + public function testBackquoteForbidenWords() { global $PMA_SQPdata_forbidden_word; diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css index a087015598..4abfd610b0 100644 --- a/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css +++ b/themes/pmahomme/jquery/jquery-ui-1.8.16.custom.css @@ -60,7 +60,7 @@ .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content a { color: #222222; } +.ui-widget-content a { color: #235A81; } .ui-widget-header { border: 1px solid #aaaaaa; background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x; color: #222222; font-weight: bold; } .ui-widget-header a { color: #222222; } |
|---|