Fix other libs as well

ozh · ozh · commit 8a5557ea35c6 · 2014-02-07T16:14:52.000+01:00
diff --git a/codeigniter/Ezsql_codeigniter.php b/codeigniter/Ezsql_codeigniter.php
@@ -79,10 +79,9 @@ function query($query)
 			}
 			
 			// Query was write (insert/delete/update etc.) query?
-			$is_insert = false;
-			
 			if ( preg_match("/^(insert|delete|update|replace|truncate|drop|create|alter)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = $this->CI->db->affected_rows();
 
 				// Take note of the insert_id
@@ -97,6 +96,7 @@ function query($query)
 			// Query was a select
 			else
 			{
+				$is_insert = false;
 				
 				// Store Query Results
 				$num_rows=0;
diff --git a/cubrid/ez_sql_cubrid.php b/cubrid/ez_sql_cubrid.php
@@ -194,16 +194,15 @@ function query($query)
 			// If there is an error then take note of it..
 			if ( $str = @cubrid_error($this->dbh) )
 			{
-				$is_insert = true;
 				$this->register_error($str);
 				$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
 				return false;
 			}
 
 			// Query was an insert, delete, update, replace
-			$is_insert = false;
 			if ( preg_match("/^(insert|delete|update|replace|truncate|drop|create|alter)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = @cubrid_affected_rows($this->dbh);
 
 				// Take note of the insert_id
@@ -218,6 +217,7 @@ function query($query)
 			// Query was a select
 			else
 			{
+				$is_insert = false;
 
 				// Take note of column info
 				$i=0;
diff --git a/mssql/ez_sql_mssql.php b/mssql/ez_sql_mssql.php
@@ -244,7 +244,6 @@ function query($query)
 
 				$sqlError = "ErrorCode: ".$errorCode." ### Error Severity: ".$errorSeverity." ### Error Message: ".$errorMessage." ### Query: ".$query;
 
-				$is_insert = true;
 				$this->register_error($sqlError);
 				$this->show_errors ? trigger_error($sqlError ,E_USER_WARNING) : null;
 				return false;
@@ -254,9 +253,9 @@ function query($query)
 
 
 			// Query was an insert, delete, update, replace
-			$is_insert = false;
 			if ( preg_match("/^(insert|delete|update|replace)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = @mssql_rows_affected($this->dbh);
 
 				// Take note of the insert_id
@@ -279,6 +278,7 @@ function query($query)
 			// Query was a select
 			else
 			{
+				$is_insert = false;
 
 				// Take note of column info
 				$i=0;
diff --git a/postgresql/ez_sql_postgresql.php b/postgresql/ez_sql_postgresql.php
@@ -199,7 +199,6 @@ function query($query)
 			// If there is an error then take note of it..
 			if ( $str = @pg_last_error($this->dbh) )
 			{
-				$is_insert = true;
 				$this->register_error($str);
 				$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;
 				return false;
@@ -208,6 +207,7 @@ function query($query)
 			$is_insert = false;
 			if ( preg_match("/^(insert|delete|update|replace)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = @pg_affected_rows($this->result);
 
 				// Take note of the insert_id
diff --git a/sqlsrv/ez_sql_sqlsrv.php b/sqlsrv/ez_sql_sqlsrv.php
@@ -201,7 +201,6 @@ function query($query)
 			{
 				$errors = sqlsrv_errors();
 				if (!empty($errors)) {
-					$is_insert = true;
 					foreach ($errors as $error) {
 						$sqlError = "ErrorCode: ".$error['code']." ### State: ".$error['SQLSTATE']." ### Error Message: ".$error['message']." ### Query: ".$query;
 						$this->register_error($sqlError);
@@ -216,6 +215,7 @@ function query($query)
 			$is_insert = false;
 			if ( preg_match("/^(insert|delete|update|replace)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = @sqlsrv_rows_affected($this->dbh);
 
 				// Take note of the insert_id
diff --git a/sybase/ez_sql_sybase.php b/sybase/ez_sql_sybase.php
@@ -245,7 +245,6 @@ function query($query)
 
 				$sqlError = "ErrorCode: ".$errorCode." ### Error Severity: ".$errorSeverity." ### Error Message: ".$errorMessage." ### Query: ".$query;
 
-				$is_insert = true;
 				$this->register_error($sqlError);
 				$this->show_errors ? trigger_error($sqlError ,E_USER_WARNING) : null;
 				return false;
@@ -258,6 +257,7 @@ function query($query)
 			$is_insert = false;
 			if ( preg_match("/^(insert|delete|update|replace)\s+/i",$query) )
 			{
+				$is_insert = true;
 				$this->rows_affected = @sybase_rows_affected($this->dbh);
 
 				// Take note of the insert_id

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,9 @@ function query($query)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`// Query was write (insert/delete/update etc.) query?`
`82`		`- $is_insert = false;`
`83`		`-`
`84`	`82`	`if ( preg_match("/^(insert\|delete\|update\|replace\|truncate\|drop\|create\|alter)\s+/i",$query) )`
`85`	`83`	`{`
	`84`	`+ $is_insert = true;`
`86`	`85`	`$this->rows_affected = $this->CI->db->affected_rows();`
`87`	`86`
`88`	`87`	`// Take note of the insert_id`
`@@ -97,6 +96,7 @@ function query($query)`
`97`	`96`	`// Query was a select`
`98`	`97`	`else`
`99`	`98`	`{`
	`99`	`+ $is_insert = false;`
`100`	`100`
`101`	`101`	`// Store Query Results`
`102`	`102`	`$num_rows=0;`
Original file line number	Diff line number	Diff line change
`@@ -194,16 +194,15 @@ function query($query)`
`194`	`194`	`// If there is an error then take note of it..`
`195`	`195`	`if ( $str = @cubrid_error($this->dbh) )`
`196`	`196`	`{`
`197`		`- $is_insert = true;`
`198`	`197`	`$this->register_error($str);`
`199`	`198`	`$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;`
`200`	`199`	`return false;`
`201`	`200`	`}`
`202`	`201`
`203`	`202`	`// Query was an insert, delete, update, replace`
`204`		`- $is_insert = false;`
`205`	`203`	`if ( preg_match("/^(insert\|delete\|update\|replace\|truncate\|drop\|create\|alter)\s+/i",$query) )`
`206`	`204`	`{`
	`205`	`+ $is_insert = true;`
`207`	`206`	`$this->rows_affected = @cubrid_affected_rows($this->dbh);`
`208`	`207`
`209`	`208`	`// Take note of the insert_id`
`@@ -218,6 +217,7 @@ function query($query)`
`218`	`217`	`// Query was a select`
`219`	`218`	`else`
`220`	`219`	`{`
	`220`	`+ $is_insert = false;`
`221`	`221`
`222`	`222`	`// Take note of column info`
`223`	`223`	`$i=0;`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,6 @@ function query($query)`
`199`	`199`	`// If there is an error then take note of it..`
`200`	`200`	`if ( $str = @pg_last_error($this->dbh) )`
`201`	`201`	`{`
`202`		`- $is_insert = true;`
`203`	`202`	`$this->register_error($str);`
`204`	`203`	`$this->show_errors ? trigger_error($str,E_USER_WARNING) : null;`
`205`	`204`	`return false;`
`@@ -208,6 +207,7 @@ function query($query)`
`208`	`207`	`$is_insert = false;`
`209`	`208`	`if ( preg_match("/^(insert\|delete\|update\|replace)\s+/i",$query) )`
`210`	`209`	`{`
	`210`	`+ $is_insert = true;`
`211`	`211`	`$this->rows_affected = @pg_affected_rows($this->result);`
`212`	`212`
`213`	`213`	`// Take note of the insert_id`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,6 @@ function query($query)`
`201`	`201`	`{`
`202`	`202`	`$errors = sqlsrv_errors();`
`203`	`203`	`if (!empty($errors)) {`
`204`		`- $is_insert = true;`
`205`	`204`	`foreach ($errors as $error) {`
`206`	`205`	`$sqlError = "ErrorCode: ".$error['code']." ### State: ".$error['SQLSTATE']." ### Error Message: ".$error['message']." ### Query: ".$query;`
`207`	`206`	`$this->register_error($sqlError);`
`@@ -216,6 +215,7 @@ function query($query)`
`216`	`215`	`$is_insert = false;`
`217`	`216`	`if ( preg_match("/^(insert\|delete\|update\|replace)\s+/i",$query) )`
`218`	`217`	`{`
	`218`	`+ $is_insert = true;`
`219`	`219`	`$this->rows_affected = @sqlsrv_rows_affected($this->dbh);`
`220`	`220`
`221`	`221`	`// Take note of the insert_id`