diff options
| author | Kyle Johnson <blyxx86@gmail.com> | 2012-10-05 11:51:31 +0200 |
|---|---|---|
| committer | Kyle Johnson <blyxx86@gmail.com> | 2012-10-05 11:51:31 +0200 |
| commit | fad389699e2e851af09c1f4508646194c2f45660 (patch) | |
| tree | 8a595af2bd1980e4a475f5db5f4ce9f7bc8cd170 /tests | |
| parent | ddb32da0e86510d7e68c5432a1657732a01b5d34 (diff) | |
| parent | f20bca9e065751fc271cb650f9246073492eccea (diff) | |
Fixed conflicts in changelog to reflect all changes.
Conflicts:
user_guide_src/source/changelog.rst
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/codeigniter/database/query_builder/escape_test.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/codeigniter/database/query_builder/escape_test.php b/tests/codeigniter/database/query_builder/escape_test.php index c6380ddf1..27e678f22 100644 --- a/tests/codeigniter/database/query_builder/escape_test.php +++ b/tests/codeigniter/database/query_builder/escape_test.php @@ -27,7 +27,7 @@ class Escape_test extends CI_TestCase { if (strpos(DB_DRIVER, 'mysql') !== FALSE) { - $sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%' ESCAPE '';"; + $sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%' ESCAPE '!';"; } else { @@ -52,7 +52,7 @@ class Escape_test extends CI_TestCase { if (strpos(DB_DRIVER, 'mysql') !== FALSE) { - $sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%' ESCAPE '';"; + $sql = "SELECT `value` FROM `misc` WHERE `key` LIKE '$string%' ESCAPE '!';"; } else { |