22 Dec
2010
22 Dec
'10
8:47 p.m.
The branch, TESTING has been updated
via e795d42205feea5032654414fb8618aa42343d44 (commit)
via eaac45dfda2daa345edc5165b30bedea5a3f18a0 (commit)
via 1ceccbd50cc0359ac2543e4283a70b2440752b59 (commit)
via 8afdcbe2b89888b4e7e3ca58224cb01ebe8db73c (commit)
via b6f717a6025c3785430c4cf317cfa5786564729b (commit)
from 6a4a537c74868073819c04e7fd49bbeb81059666 (commit)
- Log -----------------------------------------------------------------
commit e795d42205feea5032654414fb8618aa42343d44
Merge: 6a4a537c74868073819c04e7fd49bbeb81059666 eaac45dfda2daa345edc5165b30bedea5a3f18a0
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Dec 22 12:32:50 2010 -0500
Merge branch 'MAINT_3_3_9' into TESTING
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
Documentation.html | 4 ++--
README | 4 ++--
libraries/Config.class.php | 2 +-
libraries/export/sql.php | 2 +-
libraries/sqlparser.data.php | 23 +++++++++++++++++++----
libraries/sqlparser.lib.php | 38 ++++++++++++++++++--------------------
translators.html | 4 ++--
8 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index bb6911c..a12e057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -137,6 +137,8 @@
- patch #3117535 [replication] Add quotes to database in initial statement,
thanks to Craig Duncan - duncan3dc
- bug #3112614 [pdf schema] Scratchboard for PDF pages not working
+- bug #3125606 [parser] Query for table "level" causes strange display
+- bug #3127904 [parser] Close all opened round brackets indents
3.3.8.1 (2010-11-29)
- bug #3115519 (private) [security] XSS on db search, see PMASA-2010-8
diff --git a/Documentation.html b/Documentation.html
index 2d53af6..4b44689 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<link rel="icon" href="./favicon.ico"
type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico"
type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html;
charset=utf-8" />
- <title>phpMyAdmin 3.4.0-beta1 - Documentation</title>
+ <title>phpMyAdmin 3.3.9-rc1 - Documentation</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span
class="myadmin">MyAdmin</span></a>
- 3.4.0-beta1
+ 3.3.9-rc1
Documentation
</h1>
</div>
diff --git a/README b/README
index 9f92b9a..9ccf2d5 100644
--- a/README
+++ b/README
@@ -25,8 +25,8 @@ This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.
- Version 3.3.8.1
- ---------------
+ Version 3.3.9-rc1
+ -----------------
http://www.phpmyadmin.net/
You should have received a copy of the GNU General Public License
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index b2bff78..40ff7ae 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -96,7 +96,7 @@ class PMA_Config
*/
function checkSystem()
{
- $this->set('PMA_VERSION', '3.4.0-beta1');
+ $this->set('PMA_VERSION', '3.3.9-rc1');
/**
* @deprecated
*/
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index cc8cc75..f155b6f 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -503,7 +503,7 @@ function PMA_exportDBFooter($db)
* Returns a stand-in CREATE definition to resolve view dependencies
*
* @param string the database name
- * @param string the vew name
+ * @param string the view name
* @param string the end of line sequence
*
* @return string resulting definition
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index dffd6b1..90b4304 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -516,7 +516,6 @@ $PMA_SQPdata_reserved_word = array (
'LAST_INSERT_ID',
'LEADING',
'LEFT',
- 'LEVEL',
'LIKE',
'LIMIT',
'LINEAR', // 5.1
@@ -686,7 +685,24 @@ $PMA_SQPdata_reserved_word = array (
*
* @global integer MySQL reserved words count
*/
-$PMA_SQPdata_reserved_word_cnt = 289;
+$PMA_SQPdata_reserved_word_cnt = 287;
+/**
+ * The previous array must be sorted so that the binary search work.
+ * Sometimes a word is not added in the correct order, so
+ * this debugging code shows the problem. The same should be
+ * done for all arrays.
+ */
+/*
+$original = $PMA_SQPdata_reserved_word;
+sort($PMA_SQPdata_reserved_word);
+$difference = array_diff_assoc($original, $PMA_SQPdata_reserved_word);
+echo '<pre>';
+print_r($difference);
+echo '</pre>';
+echo '<pre>';
+print_r($PMA_SQPdata_reserved_word);
+echo '</pre>';
+*/
/**
* words forbidden to be used as column or table name wihtout quotes
@@ -905,7 +921,6 @@ $PMA_SQPdata_forbidden_word = array (
'LEAVE',
'LEAVES',
'LEFT',
- 'LEVEL',
'LIKE',
'LIMIT',
'LINEAR', // 5.1
@@ -1184,7 +1199,7 @@ $PMA_SQPdata_forbidden_word = array (
*
* @global integer MySQL forbidden words count
*/
-$PMA_SQPdata_forbidden_word_cnt = 483;
+$PMA_SQPdata_forbidden_word_cnt = 482;
/**
* the MySQL column/data types
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index a6676e4..4c439b0 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2197,7 +2197,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// DEBUG echo "Loop format <strong>" . $arr[$i]['data'] .
"</strong> " . $arr[$i]['type'] . "<br />";
$before = '';
$after = '';
- $indent = 0;
// array_shift($typearr);
/*
0 prev2
@@ -2297,17 +2296,20 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
break;
case 'punct_bracket_close_round':
- $bracketlevel--;
- if ($infunction == TRUE) {
- $functionlevel--;
- $after .= ' ';
- $before .= ' ';
- } else {
- $indent--;
- $before .= ($mode != 'query_only' ?
'</div>' : ' ');
- }
- $infunction = ($functionlevel > 0) ? TRUE : FALSE;
- break;
+ // only close bracket level when it was opened before
+ if ($bracketlevel > 0) {
+ $bracketlevel--;
+ if ($infunction == TRUE) {
+ $functionlevel--;
+ $after .= ' ';
+ $before .= ' ';
+ } else {
+ $indent--;
+ $before .= ($mode != 'query_only' ? '</div>' : '
');
+ }
+ $infunction = ($functionlevel > 0) ? TRUE : FALSE;
+ }
+ break;
case 'alpha_columnType':
if ($docu) {
switch ($arr[$i]['data']) {
@@ -2610,14 +2612,10 @@ if (! defined('PMA_MINIMUM_COMMON')) {
}
$str .= $after;
} // end for
- /* End possibly unclosed documentation link */
- if ($close_docu_link) {
- $str .= '</a>';
- $close_docu_link = false;
- }
- if ($mode!='query_only') {
- // close inner_sql span
- $str .= '</span>';
+ // close unclosed indent levels
+ while ($indent > 0) {
+ $indent--;
+ $str .= ($mode != 'query_only' ? '</div>' : ' ');
}
if ($mode=='color') {
// close syntax span
diff --git a/translators.html b/translators.html
index af0188e..fdefa36 100644
--- a/translators.html
+++ b/translators.html
@@ -10,7 +10,7 @@
<link rel="icon" href="./favicon.ico"
type="image/x-icon" />
<link rel="shortcut icon" href="./favicon.ico"
type="image/x-icon" />
<meta http-equiv="Content-Type" content="text/html;
charset=utf-8" />
- <title>phpMyAdmin 3.4.0-beta1 - Official translators</title>
+ <title>phpMyAdmin 3.3.9-rc1 - Official translators</title>
<link rel="stylesheet" type="text/css"
href="docs.css" />
</head>
@@ -18,7 +18,7 @@
<div id="header">
<h1>
<a href="http://www.phpmyadmin.net/">php<span
class="myadmin">MyAdmin</span></a>
- 3.4.0-beta1
+ 3.3.9-rc1
official translators list
</h1>
</div>
hooks/post-receive
--
phpMyAdmin