From a09ed79242d919f4f04e12a0bfc8fab9bb5f8b60 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 19 Aug 2020 14:13:34 +0300
Subject: [PATCH] cleanup

---
 .../Espo/Core/Select/SelectManager.php        |  2 +-
 .../ORM/QueryComposer/BaseQueryComposer.php   | 13 +++++++++----
 .../Espo/ORM/QueryComposer/QueryComposer.php  | 19 -------------------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/application/Espo/Core/Select/SelectManager.php b/application/Espo/Core/Select/SelectManager.php
index 9af5ff0274..80ab5010d2 100644
--- a/application/Espo/Core/Select/SelectManager.php
+++ b/application/Espo/Core/Select/SelectManager.php
@@ -459,7 +459,7 @@ class SelectManager
             throw new Error("Can't apply inCategory for link {$link}.");
         }
 
-        $pathName = lcfirst($query->sanitize($foreignEntity)) . 'Path';
+        $pathName = lcfirst($foreignEntity) . 'Path';
 
         if ($defs['type'] == 'manyMany') {
             if (empty($defs['midKeys'])) {
diff --git a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
index 500f57e9bd..08dfe5ab3a 100644
--- a/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/BaseQueryComposer.php
@@ -251,7 +251,7 @@ abstract class BaseQueryComposer implements QueryComposer
 
     /**
      * @deprecated
-     * @todo Remove in v6.4.
+     * @todo Remove in 6.5.
      */
     public function createSelectQuery(string $entityType, ?array $params = null) : string
     {
@@ -1899,8 +1899,8 @@ abstract class BaseQueryComposer implements QueryComposer
 
     /**
      * Quote a value (if needed).
-     *
-     * @todo Make protected.
+     * @deprecated
+     * @todo Make protected in 6.5.
      */
     public function quote($value) : string
     {
@@ -1924,7 +1924,8 @@ abstract class BaseQueryComposer implements QueryComposer
     }
 
     /**
-     * {@inheritdoc)
+     * @deprecated
+     * @todo Make protected in 6.5.
      */
     public function toDb(string $string) : string
     {
@@ -2412,6 +2413,8 @@ abstract class BaseQueryComposer implements QueryComposer
 
     /**
      * Sanitize a string.
+     * @todo Make protected in 6.5.
+     * @deprecated
      */
     public function sanitize(string $string) : string
     {
@@ -2420,6 +2423,8 @@ abstract class BaseQueryComposer implements QueryComposer
 
     /**
      * Sanitize an alias for a SELECT statement.
+     * @todo Make protected in 6.5.
+     * @deprecated
      */
     public function sanitizeSelectAlias(string $string) : string
     {
diff --git a/application/Espo/ORM/QueryComposer/QueryComposer.php b/application/Espo/ORM/QueryComposer/QueryComposer.php
index b50ee0a6d4..9dd76cfc69 100644
--- a/application/Espo/ORM/QueryComposer/QueryComposer.php
+++ b/application/Espo/ORM/QueryComposer/QueryComposer.php
@@ -39,23 +39,4 @@ interface QueryComposer
      * Compose a SQL query by a given query parameters.
      */
     public function compose(Query $query) : string;
-
-    /**
-     * Convert a camelCase string to a corresponding representation for DB.
-     * @todo Remove from the interface? Make protected?
-     */
-    public function toDb(string $string) : string;
-
-    /**
-     * Sanitize a string.
-     * @todo Remove from the interface?
-     */
-    public function sanitize(string $string) : string;
-
-    /**
-     * Sanitize an alias for a SELECT statement.
-     * Needed to be able to access rows by alias from a query results.
-     * Different database systems may have different restrictions on alias names.
-     */
-    public function sanitizeSelectAlias(string $string);
 }