From 64f85c656af01a9193e4d1f2ed51ab91ae847cf8 Mon Sep 17 00:00:00 2001
From: Christian Wolf <github@christianwolf.email>
Date: Fri, 14 Aug 2020 13:52:53 +0200
Subject: [PATCH] Extraction of all table named to static class constants in DB
 connection source

---
 TODO.md             |  1 -
 lib/Db/RecipeDb.php | 26 +++++++++++++-------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/TODO.md b/TODO.md
index 218c936c6..16362d5ff 100644
--- a/TODO.md
+++ b/TODO.md
@@ -6,6 +6,5 @@
 - Truncate DB to restart from scratch
 - Export DB for debugging?
 - Abort Search for JSON after fixed numer/time to avoid timeout
-- Use of table names from constants in DB table
 
 # Bugs found
diff --git a/lib/Db/RecipeDb.php b/lib/Db/RecipeDb.php
index cfb24acb8..e4d9fca86 100755
--- a/lib/Db/RecipeDb.php
+++ b/lib/Db/RecipeDb.php
@@ -53,17 +53,17 @@ public function findRecipeById(int $id) {
     public function deleteRecipeById(int $id) {
         $qb = $this->db->getQueryBuilder();
 
-        $qb->delete('cookbook_names')
+        $qb->delete(self::DB_TABLE_RECIPES)
             ->where('recipe_id = :id');
         $qb->setParameter('id', $id, IQueryBuilder::PARAM_INT);
         
         $qb->execute();
         
-        $qb->delete('cookbook_keywords')
+        $qb->delete(self::DB_TABLE_KEYWORDS)
             ->where('recipe_id = :id');
         $qb->setParameter('id', $id, IQueryBuilder::PARAM_INT);
         
-        $qb->delete('cookbook_categories')
+        $qb->delete(self::DB_TABLE_CATEGORIES)
             ->where('recipe_id = :id');
         $qb->setParameter('id', $id, IQueryBuilder::PARAM_INT);
 
@@ -74,7 +74,7 @@ public function findAllRecipes(string $user_id) {
         $qb = $this->db->getQueryBuilder();
 
         $qb->select('*')
-            ->from('cookbook_names', 'r')
+            ->from(self::DB_TABLE_RECIPES, 'r')
             ->where('user_id = :user')
             ->orderBy('r.name');
         $qb->setParameter('user', $user_id, TYPE::STRING);
@@ -107,7 +107,7 @@ public function findAllKeywords(string $user_id) {
 
         $qb->select('k.name')
 			->selectAlias($qb->createFunction('COUNT(k.recipe_id)'), 'recipe_count')
-            ->from('cookbook_keywords', 'k')
+            ->from(self::DB_TABLE_KEYWORDS, 'k')
             ->where('user_id = :user AND k.name != \'\'')
             ->groupBy('k.name')
             ->orderBy('k.name');
@@ -128,7 +128,7 @@ public function findAllCategories(string $user_id) {
 
         $qb->select('k.name')
 			->selectAlias($qb->createFunction('COUNT(k.recipe_id)'), 'recipe_count')
-            ->from('cookbook_categories', 'k')
+            ->from(self::DB_TABLE_CATEGORIES, 'k')
             ->where('user_id = :user AND k.name != \'\'')
             ->groupBy('k.name')
             ->orderBy('k.name');
@@ -178,13 +178,13 @@ public function getRecipesByCategory(string $category, string $user_id) {
         $qb = $this->db->getQueryBuilder();
 
         $qb->select(['r.recipe_id', 'r.name'])
-            ->from('cookbook_categories', 'k')
+            ->from(self::DB_TABLE_CATEGORIES, 'k')
             ->where('k.name = :category')
             ->andWhere('k.user_id = :user')
             ->setParameter('category', $category, TYPE::STRING)
             ->setParameter('user', $user_id, TYPE::STRING);
         
-        $qb->join('k', 'cookbook_names', 'r', 'k.recipe_id = r.recipe_id');
+        $qb->join('k', self::DB_TABLE_RECIPES, 'r', 'k.recipe_id = r.recipe_id');
 
         $qb->groupBy(['r.name', 'r.recipe_id']);
         $qb->orderBy('r.name');
@@ -207,7 +207,7 @@ public function findRecipes(array $keywords, string $user_id) {
         $qb = $this->db->getQueryBuilder();
 
         $qb->select(['r.recipe_id', 'r.name'])
-            ->from('cookbook_keywords', 'k');
+            ->from(self::DB_TABLE_KEYWORDS, 'k');
         
         $paramIdx = 1;
         $params = [];
@@ -231,7 +231,7 @@ public function findRecipes(array $keywords, string $user_id) {
         $qb->setParameters($params, $types);
         $qb->setParameter('user', $user_id, TYPE::STRING);
         
-        $qb->join('k', 'cookbook_names', 'r', 'k.recipe_id = r.recipe_id');
+        $qb->join('k', self::DB_TABLE_RECIPES, 'r', 'k.recipe_id = r.recipe_id');
 
         $qb->groupBy(['r.name', 'r.recipe_id']);
         $qb->orderBy('r.name');
@@ -250,7 +250,7 @@ public function findRecipes(array $keywords, string $user_id) {
     public function emptySearchIndex(string $user_id) {
         $qb = $this->db->getQueryBuilder();
         
-        $qb->delete('cookbook_names')
+        $qb->delete(self::DB_TABLE_RECIPES)
             ->where('user_id = :user')
             ->orWhere('user_id = :empty');
         $qb->setParameter('user', $user_id, TYPE::STRING);
@@ -258,13 +258,13 @@ public function emptySearchIndex(string $user_id) {
         
         $qb->execute();
         
-        $qb->delete('cookbook_keywords')
+        $qb->delete(self::DB_TABLE_KEYWORDS)
             ->where('user_id = :user')
             ->orWhere('user_id = :empty');
         $qb->setParameter('user', $user_id, TYPE::STRING);
         $qb->setParameter('empty', 'empty', TYPE::STRING);
         
-        $qb->delete('cookbook_categories')
+        $qb->delete(self::DB_TABLE_CATEGORIES)
             ->where('user_id = :user')
             ->orWhere('user_id = :empty');
         $qb->setParameter('user', $user_id, TYPE::STRING);