From 56e452ad93753754e16418f361930ef4d70f06e2 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Fri, 14 Jul 2017 13:05:48 +0300 Subject: [ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_type add is_write_type method for merge query --- system/database/DB_driver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system/database') diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 3eb51f734..7efb37333 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -1044,7 +1044,7 @@ abstract class CI_DB_driver { */ public function is_write_type($sql) { - return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX)\s/i', $sql); + return (bool) preg_match('/^\s*"?(SET|INSERT|UPDATE|DELETE|REPLACE|CREATE|DROP|TRUNCATE|LOAD|COPY|ALTER|RENAME|GRANT|REVOKE|LOCK|UNLOCK|REINDEX|MERGE)\s/i', $sql); } // -------------------------------------------------------------------- -- cgit v1.2.3-24-g4f1b