summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorytetsuro <phper.0o0@gmail.com>2017-07-12 08:44:35 +0200
committerytetsuro <phper.0o0@gmail.com>2017-07-13 17:46:51 +0200
commit216b80a381a4d151e4f748542a9190292a928d79 (patch)
treeb1fcfa177e903ebb03b28730a10bb7e0b59e3647 /system/database
parent3b943589b3d78731460895c7f02886bebdb76b45 (diff)
add is_write_type method for merge query
Signed-off-by: tetsuro yoshikawa <phper.0o0@gmail.com>
Diffstat (limited to 'system/database')
-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 1dc23d72e..e04525de3 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -982,7 +982,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);
}
// --------------------------------------------------------------------