fix

Author: sclubricants

system/Database/BaseConnection.php

@@ -1238,11 +1238,11 @@ public function escape($str)
         }
 
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
-            if (is_object($str) && basename(strtr(get_class($str), '\\', '/')) === basename(strtr(RawSql::class, '\\', '/'))) {
+            if (is_a($str, RawSql::class)) {
                 return $str->__toString();
             }
 
-            return "'" . $str . "'";
+            return "'" . $this->escapeString($str) . "'";
         }
 
         if (is_bool($str)) {

system/Database/Postgre/Connection.php

@@ -182,7 +182,7 @@ public function escape($str)
         }
 
         if (is_string($str) || (is_object($str) && method_exists($str, '__toString'))) {
-            if (is_object($str) && basename(strtr(get_class($str), '\\', '/')) === basename(strtr(RawSql::class, '\\', '/'))) {
+            if (is_a($str, RawSql::class)) {
                 return $str->__toString();
             }