nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* libraries/sqlparser.lib.php3:

Browse Source 
- Spacing around if statements
- Added require statements for parser
- Moved to global constants for size of keyword arrays
This commit is contained in:
Robin Johnson
2002-07-24 21:37:22 +00:00
parent f14e05364c
commit b3aba47a81
2 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -11,6 +11,9 @@ $Source$
2002-07-24 Robin Johnson <robbat2@users.sourceforge.net> 2002-07-24 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/string.lib.php3: optimizations (thanks Lo<4C>c) * libraries/string.lib.php3: optimizations (thanks Lo<4C>c)
* libraries/sqlparser.lib.php3: SQL Parser merging (in progress) * libraries/sqlparser.lib.php3: SQL Parser merging (in progress)
- Spacing around if statements
- Added require statements for parser
- Moved to global constants for size of keyword arrays
* libraries/sqlparser.data.php3: Merged * libraries/sqlparser.data.php3: Merged
2002-07-24 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-07-24 Lo<4C>c Chapeaux <lolo@phpheaven.net>

30
libraries/sqlparser.lib.php3
View File

@@ -28,9 +28,13 @@
* *
*/ */
if (!defined('PMA_SQP_LIB_INCLUDED')) { if (!defined('PMA_SQP_LIB_INCLUDED')) {
define('PMA_SQP_LIB_INCLUDED', 1); define('PMA_SQP_LIB_INCLUDED', 1);
require('./libraries/string.lib.php3');
require('./libraries/sqlparser.data.php3');
if (!defined('DEBUGTIMING')) { if (!defined('DEBUGTIMING')) {
function PMA_SQP_ArrayAdd(&$arr,$type,$data, &$arrsize) function PMA_SQP_ArrayAdd(&$arr,$type,$data, &$arrsize)
{ {
@@ -262,7 +266,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
continue; continue;
} }
//check for alpha //check for alpha
if( FALSE && PMA_STR_IsSqlIdentifier($c,FALSE) || ($c == '@')) { if (PMA_STR_IsSqlIdentifier($c,FALSE) || ($c == '@')) {
$count2 ++; $count2 ++;
$is_SQLvariable = ($c == '@'); $is_SQLvariable = ($c == '@');
$is_Digit = (!$is_SQLvariable) && PMA_STR_IsDigit($c); $is_Digit = (!$is_SQLvariable) && PMA_STR_IsDigit($c);
@@ -359,11 +363,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} }
global $syntax_columnAttrib, $syntax_reservedWord, $syntax_columnType, $syntax_functionName; global $PMA_SQPdata_ColumnAttrib, $PMA_SQPdata_ReservedWord, $PMA_SQPdata_ColumnType, $PMA_SQPdata_FunctionName,
$len_columnAttrib = count($syntax_columnAttrib); $PMA_SQPdata_ColumnAttribLen, $PMA_SQPdata_ReservedWordLen, $PMA_SQPdata_ColumnTypeLen, $PMA_SQPdata_FunctionNameLen;
$len_reservedWord = count($syntax_reservedWord);
$len_columnType = count($syntax_columnType);
$len_functionName = count($syntax_functionName);
if ($arraysize > 0) { if ($arraysize > 0) {
$t_next = $sql_array[0]['type']; $t_next = $sql_array[0]['type'];
@@ -383,13 +384,13 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
$d_cur_upper = strtoupper($sql_array[$i]['data']); $d_cur_upper = strtoupper($sql_array[$i]['data']);
if ( ($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) { if ( ($t_next == 'punct_qualifier') || ($t_prev == 'punct_qualifier')) {
$t_suffix = '_identifier'; $t_suffix = '_identifier';
} elseif( ($t_next == 'punct_bracket_open_round') && PMA_STR_BinarySearchInArr($d_cur_upper,$syntax_functionName,$len_functionName)) { } elseif ( ($t_next == 'punct_bracket_open_round') && PMA_STR_BinarySearchInArr($d_cur_upper,$PMA_SQPdata_FunctionName,$PMA_SQPdata_FunctionNameLen)) {
$t_suffix = '_functionName'; $t_suffix = '_functionName';
} elseif(PMA_STR_BinarySearchInArr($d_cur_upper,$syntax_reservedWord,$len_reservedWord)) { } elseif (PMA_STR_BinarySearchInArr($d_cur_upper,$PMA_SQPdata_ReservedWord,$PMA_SQPdata_ReservedWordLen)) {
$t_suffix = '_reservedWord'; $t_suffix = '_reservedWord';
} elseif(PMA_STR_BinarySearchInArr($d_cur_upper,$syntax_columnType,$len_columnType)) { } elseif (PMA_STR_BinarySearchInArr($d_cur_upper,$PMA_SQPdata_ColumnType,$PMA_SQPdata_ColumnTypeLen)) {
$t_suffix = '_columnType'; $t_suffix = '_columnType';
} elseif(PMA_STR_BinarySearchInArr($d_cur_upper,$syntax_columnAttrib,$len_columnAttrib)) { } elseif (PMA_STR_BinarySearchInArr($d_cur_upper,$PMA_SQPdata_ColumnAttrib,$PMA_SQPdata_ColumnAttribLen)) {
$t_suffix = '_columnAttrib'; $t_suffix = '_columnAttrib';
} else { } else {
// Do nothing // Do nothing
@@ -407,7 +408,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
} }
function PMA_SQP_Analyze($arr) { function PMA_SQP_Analyze($arr)
{
$result = array(); $result = array();
$size = $arr['len']; $size = $arr['len'];
$subresult = array( $subresult = array(
@@ -490,7 +492,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
echo '</pre>'; echo '</pre>';
} }
function PMA_SQP_FormatHTML_colorize($arr) { function PMA_SQP_FormatHTML_colorize($arr)
{
$i = strpos($arr['type'],'_'); $i = strpos($arr['type'],'_');
$class = ''; $class = '';
if ($i > 0) { if ($i > 0) {
@@ -501,7 +504,8 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
return '<span class="'.$class.'">'.htmlspecialchars($arr['data']).'</span>'; return '<span class="'.$class.'">'.htmlspecialchars($arr['data']).'</span>';
} }
function PMA_SQP_FormatHTML($arr) { function PMA_SQP_FormatHTML($arr)
{
$str = ''; $str = '';
$indent = 0; $indent = 0;
$bracketlevel = 0; $bracketlevel = 0;