Revert "[#14080] - Added escaping for tables with schemas"

This reverts commit 9c0473b.
phalcon · Jul 6, 2019 · 35163a4 · 35163a4
1 parent 5fae345
commit 35163a4
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/phalcon/Mvc/Model.zep b/phalcon/Mvc/Model.zep
@@ -1112,7 +1112,6 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
         } else {
             let table = source;
         }
-        let table = writeConnection->escapeIdentifier(table);
 
         /**
          * Join the conditions in the array using an AND operator
@@ -2169,8 +2168,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
             let table = source;
         }
 
-        let table     = readConnection->escapeIdentifier(table),
-            uniqueKey = this->uniqueKey;
+        let uniqueKey = this->uniqueKey;
 
         if !uniqueKey {
             /**
@@ -2209,7 +2207,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
             tables = dialect->select(
                 [
                     "columns": fields,
-                    "tables":  table,
+                    "tables":  readConnection->escapeIdentifier(table),
                     "where":   uniqueKey
                 ]
             );
@@ -2309,8 +2307,7 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
         /**
          * Create/Get the current database connection
          */
-        let readConnection = this->getReadConnection(),
-            table          = readConnection->escapeIdentifier(table);
+        let readConnection = this->getReadConnection();
 
         /**
          * We need to check if the record exists
@@ -4044,14 +4041,13 @@ abstract class Model implements EntityInterface, ModelInterface, ResultInterface
         } else {
             let table = source;
         }
-        let table = connection->escapeIdentifier(table);
 
         /**
          * Here we use a single COUNT(*) without PHQL to make the execution
          * faster
          */
         let num = connection->fetchOne(
-            "SELECT COUNT(*) \"rowcount\" FROM " . table . " WHERE " . uniqueKey,
+            "SELECT COUNT(*) \"rowcount\" FROM " . connection->escapeIdentifier(table) . " WHERE " . uniqueKey,
             null,
             uniqueParams,
             uniqueTypes