Merge pull request #429 from jpfuentes2/andyleap-master

koenpunt · koenpunt · commit 1787d182d7eb · 2014-07-17T12:13:17.000+02:00
Remove require_once from inside functions
diff --git a/lib/SQLBuilder.php b/lib/SQLBuilder.php
@@ -291,7 +291,6 @@ private function prepend_table_name_to_fields($hash=array())
 
 	private function apply_where_conditions($args)
 	{
-		require_once 'Expressions.php';
 		$num_args = count($args);
 
 		if ($num_args == 1 && is_hash($args[0]))
@@ -345,7 +344,6 @@ private function build_delete()
 
 	private function build_insert()
 	{
-		require_once 'Expressions.php';
 		$keys = join(',',$this->quoted_key_names());
 
 		if ($this->sequence)
@@ -419,4 +417,4 @@ private function quoted_key_names()
 
 		return $keys;
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,6 @@ private function prepend_table_name_to_fields($hash=array())`
`291`	`291`
`292`	`292`	`private function apply_where_conditions($args)`
`293`	`293`	`{`
`294`		`- require_once 'Expressions.php';`
`295`	`294`	`$num_args = count($args);`
`296`	`295`
`297`	`296`	`if ($num_args == 1 && is_hash($args[0]))`
`@@ -345,7 +344,6 @@ private function build_delete()`
`345`	`344`
`346`	`345`	`private function build_insert()`
`347`	`346`	`{`
`348`		`- require_once 'Expressions.php';`
`349`	`347`	`$keys = join(',',$this->quoted_key_names());`
`350`	`348`
`351`	`349`	`if ($this->sequence)`
`@@ -419,4 +417,4 @@ private function quoted_key_names()`
`419`	`417`
`420`	`418`	`return $keys;`
`421`	`419`	`}`
`422`		`-}`
	`420`	`+}`