diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-07-14 12:05:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 12:05:48 +0200 |
| commit | f107a186f0ddd5695c142c3202106bea4cd4b226 (patch) | |
| tree | b1fcfa177e903ebb03b28730a10bb7e0b59e3647 | |
| parent | 3b943589b3d78731460895c7f02886bebdb76b45 (diff) | |
| parent | 216b80a381a4d151e4f748542a9190292a928d79 (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.php | 2 |
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); } // -------------------------------------------------------------------- |