mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 12:48:26 +02:00
Code Issues Releases Wiki Activity

minor SQL parser improvements

Browse Source
This commit is contained in:
SecretR
2013-02-08 11:50:05 +02:00
parent 61ed8355f7
commit ca1e0c5700
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/db_verify_class.php
View File

@@ -267,7 +267,6 @@ class db_verify
$this->results[$tbl][$field]['_valid'] = $info; $this->results[$tbl][$field]['_valid'] = $info;
$this->results[$tbl][$field]['_invalid'] = $sqlFieldData[$field]; $this->results[$tbl][$field]['_invalid'] = $sqlFieldData[$field];
$this->results[$tbl][$field]['_file'] = $selection; $this->results[$tbl][$field]['_file'] = $selection;
} }
@@ -278,7 +277,6 @@ class db_verify
// Check Index data // Check Index data
foreach($fileIndexData as $field => $info ) foreach($fileIndexData as $field => $info )
{ {
if(!is_array($sqlIndexData[$field])) // missing index. if(!is_array($sqlIndexData[$field])) // missing index.
{ {
// print_a($info); // print_a($info);
@@ -742,12 +740,12 @@ class db_verify
function getFields($data) function getFields($data, $print = false)
{ {
$mes = e107::getMessage(); $mes = e107::getMessage();
// $regex = "/`?([\w]*)`?\s*?(".implode("|",$this->fieldTypes)."|".implode("|",$this->fieldTypeNum).")\s?(?:\([\s]?([0-9,]*)[\s]?\))?[\s]?(unsigned)?[\s]?.*?(?:(NOT NULL|NULL))?[\s]*(auto_increment|default .*)?[\s]?(?:PRIMARY KEY)?[\s]*?,?\s*?\n/im"; // $regex = "/`?([\w]*)`?\s*?(".implode("|",$this->fieldTypes)."|".implode("|",$this->fieldTypeNum).")\s?(?:\([\s]?([0-9,]*)[\s]?\))?[\s]?(unsigned)?[\s]?.*?(?:(NOT NULL|NULL))?[\s]*(auto_increment|default .*)?[\s]?(?:PRIMARY KEY)?[\s]*?,?\s*?\n/im";
$regex = "/^\s*?`?([\w]*)`?\s*?(".implode("|",$this->fieldTypes)."|".implode("|",$this->fieldTypeNum).")\s?(?:\([\s]?([0-9,]*)[\s]?\))?[\s]?(unsigned)?[\s]?.*?(?:(NOT NULL|NULL))?[\s]*(auto_increment|default [\w'.-]*)?[\s]?(?:PRIMARY KEY)?[\s]*?,?\s*?\n/im"; $regex = "/^\s*?`?([\w]*)`?\s*?(".implode("|",$this->fieldTypes)."|".implode("|",$this->fieldTypeNum).")\s?(?:\([\s]?([0-9,]*)[\s]?\))?[\s]?(unsigned)?[\s]?.*?(?:(NOT NULL|NULL))?[\s]*(auto_increment|default [\w'.-]*)?[\s]?(comment [\w\s'.-]*)?[\s]?(?:PRIMARY KEY)?[\s]*?,?\s*?\n/im";
// echo $regex."<br /><br />"; // echo $regex."<br /><br />";
@@ -765,7 +763,7 @@ class db_verify
$ret = array(); $ret = array();
if($print) var_dump($regex, $m);
foreach($m[1] as $k=>$val) foreach($m[1] as $k=>$val)
{ {
@@ -782,14 +780,16 @@ class db_verify
} }
function getIndex($data) function getIndex($data, $print = false)
{ {
// $regex = "/(?:(PRIMARY|UNIQUE|FULLTEXT))?[\s]*?KEY (?: ?`?([\w]*)`?)[\s]* ?(?:\([\s]?`?([\w,]*[\s]?)`?\))?,?/i"; // $regex = "/(?:(PRIMARY|UNIQUE|FULLTEXT))?[\s]*?KEY (?: ?`?([\w]*)`?)[\s]* ?(?:\([\s]?`?([\w,]*[\s]?)`?\))?,?/i";
$regex = "/(?:(PRIMARY|UNIQUE|FULLTEXT))?[\s]*?KEY (?: ?`?([\w]*)`?)[\s]* ?(?:\([\s]?([\w,`]*[\s]?)`?\))?,?/i"; $regex = "/(?:(PRIMARY|UNIQUE|FULLTEXT))?[\s]*?KEY (?: ?`?([\w]*)`?)[\s]* ?(?:\([\s]?([\w\s,`]*[\s]?)`?\))?,?/i";
preg_match_all($regex,$data,$m); preg_match_all($regex,$data,$m);
$ret = array(); $ret = array();
if($print) var_dump($regex, $m);
// Standard Detection Method. // Standard Detection Method.
foreach($m[3] as $k=>$val) foreach($m[3] as $k=>$val)
{ {