Merge pull request #135 from gyKa/issue-128

Remove Entity\SyncJobs and refactor code.
ongr-archive · Feb 2, 2015 · a3818a1 · a3818a1
2 parents 834af1d + c09ea2d
commit a3818a1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 290 deletions.
diff --git a/Entity/SyncJob.php b/Entity/SyncJob.php
diff --git a/Sync/DiffProvider/Binlog/BinlogParser.php b/Sync/DiffProvider/Binlog/BinlogParser.php
@@ -11,7 +11,7 @@
 
 namespace ONGR\ConnectionsBundle\Sync\DiffProvider\Binlog;
 
-use ONGR\ConnectionsBundle\Entity\SyncJob;
+use ONGR\ConnectionsBundle\Sync\ActionTypes;
 
 /**
  * Parses binary log data (Interpreter).
@@ -225,11 +225,11 @@ protected function parseQuery()
 
         $this->getNextLine(self::LINE_TYPE_QUERY);
 
-        if ($buffer['type'] == SyncJob::TYPE_DELETE || $buffer['type'] === SyncJob::TYPE_UPDATE) {
+        if ($buffer['type'] == ActionTypes::DELETE || $buffer['type'] === ActionTypes::UPDATE) {
             $buffer['where'] = $this->handleStatement($this->lastLine, self::STATEMENT_TYPE_WHERE);
         }
 
-        if ($buffer['type'] == SyncJob::TYPE_CREATE || $buffer['type'] === SyncJob::TYPE_UPDATE) {
+        if ($buffer['type'] == ActionTypes::CREATE || $buffer['type'] === ActionTypes::UPDATE) {
             $buffer['set'] = $this->handleStatement($this->lastLine, self::STATEMENT_TYPE_SET);
         }
 
@@ -487,11 +487,11 @@ protected function detectQueryType($type)
     {
         switch ($type) {
             case 'INSERT INTO':
-                return SyncJob::TYPE_CREATE;
+                return ActionTypes::CREATE;
             case 'UPDATE':
-                return SyncJob::TYPE_UPDATE;
+                return ActionTypes::UPDATE;
             case 'DELETE FROM':
-                return SyncJob::TYPE_DELETE;
+                return ActionTypes::DELETE;
             default:
                 throw new \UnexpectedValueException("Unknown statement of type {$type}");
         }

diff --git a/Sync/DiffProvider/Item/DiffItemFactory.php b/Sync/DiffProvider/Item/DiffItemFactory.php
@@ -11,7 +11,7 @@
 
 namespace ONGR\ConnectionsBundle\Sync\DiffProvider\Item;
 
-use ONGR\ConnectionsBundle\Entity\SyncJob;
+use ONGR\ConnectionsBundle\Sync\ActionTypes;
 
 /**
  * DiffItem factory.
@@ -29,11 +29,11 @@ class DiffItemFactory
     public static function create($type)
     {
         switch ($type) {
-            case SyncJob::TYPE_CREATE:
+            case ActionTypes::CREATE:
                 return new CreateDiffItem();
-            case SyncJob::TYPE_UPDATE:
+            case ActionTypes::UPDATE:
                 return new UpdateDiffItem();
-            case SyncJob::TYPE_DELETE:
+            case ActionTypes::DELETE:
                 return new DeleteDiffItem();
             default:
                 throw new \InvalidArgumentException("Invalid type {$type}");