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

added infou about UFPDF to documentation

Browse Source
This commit is contained in:
Michal Čihař
2004-12-29 14:16:51 +00:00
parent 9edf126599
commit f1f39b8ed1
162 changed files with 4240 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/sqlparser.lib.php
View File

@@ -308,7 +308,7 @@ if ($is_minimum_common == FALSE) {
// ($pos === FALSE)
if ($pos < 0) {
$debugstr = $GLOBALS['strSQPBugUnclosedQuote'] . ' @ ' . $startquotepos. "\n"
. 'STR: ' . $quotetype;
. 'STR: ' . htmlspecialchars($quotetype);
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -434,7 +434,7 @@ if ($is_minimum_common == FALSE) {
} else if ($last != '~') {
$debugstr = $GLOBALS['strSQPBugUnknownPunctuation'] . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . $punct_data;
. 'STR: ' . htmlspecialchars($punct_data);
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -476,7 +476,7 @@ if ($is_minimum_common == FALSE) {
continue;
} else {
$debugstr = $GLOBALS['strSQPBugInvalidIdentifer'] . ' @ ' . ($count1+1) . "\n"
. 'STR: ' . PMA_substr($sql, $count1, $count2 - $count1);
. 'STR: ' . htmlspecialchars(PMA_substr($sql, $count1, $count2 - $count1));
PMA_SQP_throwError($debugstr, $sql);
return $sql;
}
@@ -755,6 +755,7 @@ if ($is_minimum_common == FALSE) {
* ['queryflags']['distinct'] = 1; for a DISTINCT
* ['queryflags']['union'] = 1; for a UNION
* ['queryflags']['join'] = 1; for a JOIN
* ['queryflags']['offset'] = 1; for the presence of OFFSET
*
* lem9: query clauses
* -------------
@@ -1309,6 +1310,10 @@ if ($is_minimum_common == FALSE) {
$subresult['queryflags']['join'] = 1;
}
if ($upper_data == 'OFFSET') {
$subresult['queryflags']['offset'] = 1;
}
// if this is a real SELECT...FROM
if ($upper_data == 'FROM' && isset($subresult['queryflags']['select_from']) && $subresult['queryflags']['select_from'] == 1) {
$in_from = TRUE;