don't mess with any globals

iamcal · iamcal · commit dc2997b9a23c · 2017-09-10T00:38:54.000-05:00
diff --git a/run.php b/run.php
@@ -36,7 +36,7 @@
 
 if (1){
 
-	$GLOBALS['_find_single_table'] = 0;
+	$obj->find_single_table = true;
 
 	$s = microtime(true);
 	$obj->parse($sql);
diff --git a/src/SQLParser.php b/src/SQLParser.php
@@ -12,6 +12,8 @@ class SQLParser{
 	public $tables = array();
 	public $source_map = array();
 
+	public $find_single_table = false;
+
 	public function parse($sql){
 
 		// stashes tokens and source_map in $this
@@ -206,7 +208,7 @@ function walk($tokens, $sql, $source_map){
 				$table['sql'] = $stmt['sql'];
 			}
 
-			if (isset($GLOBALS['_find_single_table']) && $GLOBALS['_find_single_table'] && count($tables)) return array(
+			if ($this->find_single_table && count($tables)) return array(
 				'tables' => $tables,
 			);
 		}

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ class SQLParser{`
`12`	`12`	`public $tables = array();`
`13`	`13`	`public $source_map = array();`
`14`	`14`
	`15`	`+ public $find_single_table = false;`
	`16`	`+`
`15`	`17`	`public function parse($sql){`
`16`	`18`
`17`	`19`	`// stashes tokens and source_map in $this`
`@@ -206,7 +208,7 @@ function walk($tokens, $sql, $source_map){`
`206`	`208`	`$table['sql'] = $stmt['sql'];`
`207`	`209`	`}`
`208`	`210`
`209`		`- if (isset($GLOBALS['_find_single_table']) && $GLOBALS['_find_single_table'] && count($tables)) return array(`
	`211`	`+ if ($this->find_single_table && count($tables)) return array(`
`210`	`212`	`'tables' => $tables,`
`211`	`213`	`);`
`212`	`214`	`}`