summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-07-14 12:05:48 +0200
committerAndrey Andreev <narf@devilix.net>2017-07-14 12:06:29 +0200
commit56e452ad93753754e16418f361930ef4d70f06e2 (patch)
tree67807a6d75d5eae7133396fe3ac880f77dcc1ec8
parent71a78c2c5ca485eac779622870a909091ec0a439 (diff)
[ci skip] Merge pull request #5183 from ytetsuro/add_oci8_driver_write_type
add is_write_type method for merge query
-rw-r--r--system/database/DB_driver.php2
1 files changed, 1 insertions, 1 deletions
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);
}
// --------------------------------------------------------------------