Merge pull request #27 from UrosPurtic/master

set table names to consts file for easy access

Author: ppavlovic

src/Consts.php

@@ -53,6 +53,9 @@ class Consts
 
     const PARAM_PRIORITY           = 'priority';
 
+    const TASKS_TABLE_NAME            = 'tasks';
+    const RECURRING_TASKS_TABLE_NAME     = 'tasks_recurrings';
+
     public static function getMap()
     {
         return array(

src/Model/Repository/Mysql/RecurringRepository.php

@@ -3,6 +3,7 @@
 namespace G4\Tasker\Model\Repository\Mysql;
 
 use G4\Tasker\Model\Repository\RecurringRepositoryInterface;
+use G4\Tasker\Consts;
 
 class RecurringRepository implements RecurringRepositoryInterface
 {
@@ -19,9 +20,8 @@ public function __construct(\PDO $db)
 
     public function getNextTasks()
     {
-        $query = 'SELECT * FROM tasks_recurrings
-WHERE status = :status_recu
-AND recu_id NOT IN (SELECT DISTINCT tasks.recu_id FROM tasks WHERE status = :status)';
+        $query = 'SELECT * FROM ' . Consts::RECURRING_TASKS_TABLE_NAME . ' WHERE status = :status_recu
+        AND recu_id NOT IN (SELECT DISTINCT tasks.recu_id FROM tasks WHERE status = :status)';
 
         $stmt = $this->pdo->prepare($query);
         $stmt->bindValue(':status_recu', \G4\Tasker\Consts::RECURRING_TASK_STATUS_ACTIVE, \PDO::PARAM_INT);

src/Model/Repository/Mysql/TaskRepository.php

@@ -37,7 +37,7 @@ public function find($id)
             throw new \RuntimeException(sprintf('Task id=%s is not integer', $id));
         }
 
-        $query = 'SELECT * FROM tasks WHERE task_id=:id';
+        $query = 'SELECT * FROM '. Consts::TASKS_TABLE_NAME .' WHERE task_id=:id';
         $stmt = $this->pdo->prepare($query);
         $stmt->execute([
             'id' => $id
@@ -59,7 +59,7 @@ public function findReserved($limit)
             throw new \RuntimeException('Limit is not valid');
         }
 
-        $query = 'SELECT * FROM tasks WHERE identifier=:identifier AND status=:status AND ts_created <= :ts_created ORDER BY ts_created ASC, priority DESC LIMIT :limit';
+        $query = 'SELECT * FROM '. Consts::TASKS_TABLE_NAME .' WHERE identifier=:identifier AND status=:status AND ts_created <= :ts_created ORDER BY ts_created ASC, priority DESC LIMIT :limit';
 
         $stmt = $this->pdo->prepare($query);
 
@@ -87,7 +87,7 @@ public function findWaitingForRetry()
 
     private function fetchTasks($status, $olderThanSeconds, $limit)
     {
-        $query = 'SELECT * FROM tasks WHERE status=:status AND ts_started<=:ts_started ORDER BY ts_started ASC, priority DESC LIMIT :limit';
+        $query = 'SELECT * FROM '. Consts::TASKS_TABLE_NAME .' WHERE status=:status AND ts_started<=:ts_started ORDER BY ts_started ASC, priority DESC LIMIT :limit';
 
         $stmt = $this->pdo->prepare($query);
         $stmt->bindValue(':status', $status, \PDO::PARAM_INT);
@@ -117,9 +117,10 @@ private function generateIdentifier()
 
     public function add(Task $task)
     {
-        $query = 'INSERT INTO tasks (recu_id, identifier, task, `data`, request_uuid, status, priority, ts_created, ts_started, exec_time, started_count)
+        $query = 'INSERT INTO ' . Consts::TASKS_TABLE_NAME . ' (recu_id, identifier, task, `data`, request_uuid, status, priority, ts_created, ts_started, exec_time, started_count)
 VALUES(:recu_id, :identifier, :task, :data, :request_uuid, :status, :priority, :ts_created, :ts_started, :exec_time, :started_count)';
 
+
         $stmt = $this->pdo->prepare($query);
         $stmt = $this->prepareFields($stmt, $task);
 
@@ -153,16 +154,17 @@ public function addBulk($tasks)
             $insertData[] = $task->getStartedCount();
         }
 
-        $sql = 'INSERT INTO tasks (recu_id, identifier, task, data, request_uuid, status, priority, ts_created, ts_started, exec_time, started_count) VALUES ';
+        $sql = 'INSERT INTO ' . Consts::TASKS_TABLE_NAME . ' (recu_id, identifier, task, data, request_uuid, status, priority, ts_created, ts_started, exec_time, started_count) VALUES ';
         $sql .= implode(', ', $insertQuery);
 
         $stmt = $this->pdo->prepare($sql);
+        $stmt->bindValue(':mudo', Consts::TASKS_TABLE_NAME);
         $this->execute($stmt,$insertData);
     }
 
     public function update(Task $task)
     {
-        $query = 'UPDATE tasks SET recu_id=:recu_id, identifier=:identifier, task=:task, `data`=:data, 
+        $query = 'UPDATE '. Consts::TASKS_TABLE_NAME .' SET recu_id=:recu_id, identifier=:identifier, task=:task, `data`=:data, 
 request_uuid=:request_uuid, status=:status, priority=:priority, ts_created=:ts_created, ts_started=:ts_started, 
 exec_time=:exec_time, started_count=:started_count WHERE task_id=:task_id';
 
@@ -186,7 +188,7 @@ public function updateStatus($status, Task ...$tasks)
                 return $task->getTaskId();
             }, $tasks);
 
-        $query= 'UPDATE tasks SET status=%d WHERE task_id IN (%s)';
+        $query= 'UPDATE '. Consts::TASKS_TABLE_NAME .' SET status=%d WHERE task_id IN (%s)';
         $this->pdo->query(
             sprintf($query, $status, implode(',', $taskIds))
         );
@@ -199,6 +201,7 @@ public function updateStatus($status, Task ...$tasks)
      */
     private function prepareFields(\PDOStatement $stmt, Task $task)
     {
+
         $stmt->bindValue(':recu_id',       $task->getRecurringId(),  \PDO::PARAM_INT);
         $stmt->bindValue(':identifier',    $task->getIdentifier());
         $stmt->bindValue(':task',          $task->getTask());