Merge branch '3.0-stable' into develop

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/codeigniter/database/query_builder/where_test.php b/tests/codeigniter/database/query_builder/where_test.php
index 20b7a567c..46a7fa2eb 100644
--- a/tests/codeigniter/database/query_builder/where_test.php
+++ b/tests/codeigniter/database/query_builder/where_test.php
@@ -123,4 +123,12 @@ class Where_test extends CI_TestCase {
 		$this->assertEquals('Musician', $jobs[1]['name']);
 	}
 
+	// ------------------------------------------------------------------------
+
+	public function test_issue4093()
+	{
+		$input = 'bar and baz or qux';
+		$sql = $this->db->where('foo', $input)->get_compiled_select('dummy');
+		$this->assertEquals("'".$input."'", substr($sql, -20));
+	}
 }
\ No newline at end of file