From 8ee8a02237b17a1564fa094aea01a90703f3a3d2 Mon Sep 17 00:00:00 2001
From: Maxime Rault <maxime.rault@cooperl.com>
Date: Thu, 24 Sep 2020 18:01:54 +0200
Subject: [PATCH] NEW: Queue managing with DB2 ODBC connections

---
 composer.json                                 |  8 +++----
 src/DB2ServiceProvider.php                    | 24 +++++++++++++++----
 .../Connectors/DB2Connector.php               |  4 ++--
 .../Connectors/IBMConnector.php               |  4 ++--
 .../Connectors/ODBCConnector.php              |  4 ++--
 .../Connectors/ODBCZOSConnector.php           |  4 ++--
 src/{ => Database}/DB2Connection.php          | 20 ++++++++--------
 .../Query/Grammars/DB2Grammar.php             |  4 ++--
 .../Query/Processors/DB2Processor.php         |  6 ++---
 .../Query/Processors/DB2ZOSProcessor.php      |  6 ++---
 src/{ => Database}/Schema/Blueprint.php       |  4 ++--
 src/{ => Database}/Schema/Builder.php         |  8 +++----
 .../Schema/Grammars/DB2ExpressCGrammar.php    |  8 +------
 .../Schema/Grammars/DB2Grammar.php            |  2 +-
 src/Queue/DB2Connector.php                    | 24 +++++++++++++++++++
 src/Queue/DB2Queue.php                        | 18 ++++++++++++++
 16 files changed, 99 insertions(+), 49 deletions(-)
 rename src/{ => Database}/Connectors/DB2Connector.php (89%)
 rename src/{ => Database}/Connectors/IBMConnector.php (81%)
 rename src/{ => Database}/Connectors/ODBCConnector.php (92%)
 rename src/{ => Database}/Connectors/ODBCZOSConnector.php (90%)
 rename src/{ => Database}/DB2Connection.php (84%)
 rename src/{ => Database}/Query/Grammars/DB2Grammar.php (98%)
 rename src/{ => Database}/Query/Processors/DB2Processor.php (90%)
 rename src/{ => Database}/Query/Processors/DB2ZOSProcessor.php (89%)
 rename src/{ => Database}/Schema/Blueprint.php (98%)
 rename src/{ => Database}/Schema/Builder.php (91%)
 rename src/{ => Database}/Schema/Grammars/DB2ExpressCGrammar.php (70%)
 rename src/{ => Database}/Schema/Grammars/DB2Grammar.php (99%)
 create mode 100644 src/Queue/DB2Connector.php
 create mode 100644 src/Queue/DB2Queue.php

diff --git a/composer.json b/composer.json
index d4e0602..7368622 100644
--- a/composer.json
+++ b/composer.json
@@ -16,20 +16,20 @@
     }
     ],
     "require": {
-        "php": "^7.2.5",
-        "illuminate/database": "^7.0"
+        "php": "^7.2",
+        "illuminate/database": "^6.0"
     },
     "require-dev": {
     },
     "autoload": {
     "psr-4": {
-        "Cooperl\\Database\\DB2\\": "src/"
+        "Cooperl\\DB2\\": "src/"
     }
     },
     "extra": {
         "laravel": {
             "providers": [
-                "Cooperl\\Database\\DB2\\DB2ServiceProvider"
+                "Cooperl\\DB2\\DB2ServiceProvider"
             ]
         }
     }
diff --git a/src/DB2ServiceProvider.php b/src/DB2ServiceProvider.php
index 4d156b5..a3a8614 100644
--- a/src/DB2ServiceProvider.php
+++ b/src/DB2ServiceProvider.php
@@ -1,18 +1,21 @@
 <?php
 
-namespace Cooperl\Database\DB2;
+namespace Cooperl\DB2;
 
 use Illuminate\Foundation\Application as LaravelApplication;
 use Laravel\Lumen\Application as LumenApplication;
-use Cooperl\Database\DB2\Connectors\ODBCConnector;
-use Cooperl\Database\DB2\Connectors\IBMConnector;
-use Cooperl\Database\DB2\Connectors\ODBCZOSConnector;
+use Cooperl\DB2\Database\DB2Connection;
+use Cooperl\DB2\Database\Connectors\ODBCConnector;
+use Cooperl\DB2\Database\Connectors\IBMConnector;
+use Cooperl\DB2\Database\Connectors\ODBCZOSConnector;
+use Cooperl\DB2\Queue\DB2Connector;
+use Illuminate\Queue\QueueManager;
 use Illuminate\Support\ServiceProvider;
 
 /**
  * Class DB2ServiceProvider
  *
- * @package Cooperl\Database\DB2
+ * @package Cooperl\DB2\Database
  */
 class DB2ServiceProvider extends ServiceProvider
 {
@@ -84,6 +87,17 @@ class DB2ServiceProvider extends ServiceProvider
                 return new DB2Connection($db2Connection, $config["database"], $config["prefix"], $config);
             });
         }
+
+        $this->app->extend(
+            'queue',
+            function (QueueManager $queueManager) {
+                $queueManager->addConnector('db2_odbc', function () {
+                    return new DB2Connector($this->app['db']);
+                });
+
+                return $queueManager;
+            }
+        );
     }
 
     /**
diff --git a/src/Connectors/DB2Connector.php b/src/Database/Connectors/DB2Connector.php
similarity index 89%
rename from src/Connectors/DB2Connector.php
rename to src/Database/Connectors/DB2Connector.php
index 391a650..e1c851e 100644
--- a/src/Connectors/DB2Connector.php
+++ b/src/Database/Connectors/DB2Connector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Connectors;
+namespace Cooperl\DB2\Database\Connectors;
 
 use Illuminate\Database\Connectors\Connector;
 use Illuminate\Database\Connectors\ConnectorInterface;
@@ -8,7 +8,7 @@ use Illuminate\Database\Connectors\ConnectorInterface;
 /**
  * Class IBMConnector
  *
- * @package Cooperl\Database\DB2\Connectors
+ * @package Cooperl\DB2\Database\Connectors
  */
 class DB2Connector extends Connector implements ConnectorInterface
 {
diff --git a/src/Connectors/IBMConnector.php b/src/Database/Connectors/IBMConnector.php
similarity index 81%
rename from src/Connectors/IBMConnector.php
rename to src/Database/Connectors/IBMConnector.php
index 4aed0c9..b5df1d1 100644
--- a/src/Connectors/IBMConnector.php
+++ b/src/Database/Connectors/IBMConnector.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cooperl\Database\DB2\Connectors;
+namespace Cooperl\DB2\Database\Connectors;
 
 /**
  * Class IBMConnector
  *
- * @package Cooperl\Database\DB2\Connectors
+ * @package Cooperl\DB2\Database\Connectors
  */
 class IBMConnector extends DB2Connector
 {
diff --git a/src/Connectors/ODBCConnector.php b/src/Database/Connectors/ODBCConnector.php
similarity index 92%
rename from src/Connectors/ODBCConnector.php
rename to src/Database/Connectors/ODBCConnector.php
index 486bc5f..b473042 100644
--- a/src/Connectors/ODBCConnector.php
+++ b/src/Database/Connectors/ODBCConnector.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cooperl\Database\DB2\Connectors;
+namespace Cooperl\DB2\Database\Connectors;
 
 /**
  * Class ODBCConnector
  *
- * @package Cooperl\Database\DB2\Connectors
+ * @package Cooperl\DB2\Database\Connectors
  */
 class ODBCConnector extends DB2Connector
 {
diff --git a/src/Connectors/ODBCZOSConnector.php b/src/Database/Connectors/ODBCZOSConnector.php
similarity index 90%
rename from src/Connectors/ODBCZOSConnector.php
rename to src/Database/Connectors/ODBCZOSConnector.php
index 99d44af..85362c6 100644
--- a/src/Connectors/ODBCZOSConnector.php
+++ b/src/Database/Connectors/ODBCZOSConnector.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace Cooperl\Database\DB2\Connectors;
+namespace Cooperl\DB2\Database\Connectors;
 
 /**
  * Class ODBCZOSConnector
  *
- * @package Cooperl\Database\DB2\Connectors
+ * @package Cooperl\DB2\Database\Connectors
  */
 class ODBCZOSConnector extends ODBCConnector
 {
diff --git a/src/DB2Connection.php b/src/Database/DB2Connection.php
similarity index 84%
rename from src/DB2Connection.php
rename to src/Database/DB2Connection.php
index fc61f70..3899d02 100644
--- a/src/DB2Connection.php
+++ b/src/Database/DB2Connection.php
@@ -1,22 +1,22 @@
 <?php
 
-namespace Cooperl\Database\DB2;
+namespace Cooperl\DB2\Database;
 
 use PDO;
 
 use Illuminate\Database\Connection;
 
-use Cooperl\Database\DB2\Schema\Builder;
-use Cooperl\Database\DB2\Query\Processors\DB2Processor;
-use Cooperl\Database\DB2\Query\Processors\DB2ZOSProcessor;
-use Cooperl\Database\DB2\Query\Grammars\DB2Grammar as QueryGrammar;
-use Cooperl\Database\DB2\Schema\Grammars\DB2Grammar as SchemaGrammar;
-use Cooperl\Database\DB2\Schema\Grammars\DB2ExpressCGrammar;
+use Cooperl\DB2\Database\Schema\Builder;
+use Cooperl\DB2\Database\Query\Processors\DB2Processor;
+use Cooperl\DB2\Database\Query\Processors\DB2ZOSProcessor;
+use Cooperl\DB2\Database\Query\Grammars\DB2Grammar as QueryGrammar;
+use Cooperl\DB2\Database\Schema\Grammars\DB2Grammar as SchemaGrammar;
+use Cooperl\DB2\Database\Schema\Grammars\DB2ExpressCGrammar;
 
 /**
  * Class DB2Connection
  *
- * @package Cooperl\Database\DB2
+ * @package Cooperl\DB2\Database
  */
 class DB2Connection extends Connection
 {
@@ -86,7 +86,7 @@ class DB2Connection extends Connection
     /**
      * Get a schema builder instance for the connection.
      *
-     * @return \Cooperl\Database\DB2\Schema\Builder
+     * @return \Cooperl\DB2\Database\Schema\Builder
      */
     public function getSchemaBuilder()
     {
@@ -133,7 +133,7 @@ class DB2Connection extends Connection
     /**
      * Get the default post processor instance.
      *
-     * @return \Cooperl\Database\DB2\Query\Processors\DB2Processor|\Cooperl\Database\DB2\Query\Processors\DB2ZOSProcessor
+     * @return \Cooperl\DB2\Database\Query\Processors\DB2Processor|\Cooperl\DB2\Database\Query\Processors\DB2ZOSProcessor
      */
     protected function getDefaultPostProcessor()
     {
diff --git a/src/Query/Grammars/DB2Grammar.php b/src/Database/Query/Grammars/DB2Grammar.php
similarity index 98%
rename from src/Query/Grammars/DB2Grammar.php
rename to src/Database/Query/Grammars/DB2Grammar.php
index 1d4efc0..1d119f0 100644
--- a/src/Query/Grammars/DB2Grammar.php
+++ b/src/Database/Query/Grammars/DB2Grammar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Query\Grammars;
+namespace Cooperl\DB2\Database\Query\Grammars;
 
 use Illuminate\Database\Query\Grammars\Grammar;
 use Illuminate\Database\Query\Builder;
@@ -8,7 +8,7 @@ use Illuminate\Database\Query\Builder;
 /**
  * Class DB2Grammar
  *
- * @package Cooperl\Database\DB2\Query\Grammars
+ * @package Cooperl\DB2\Database\Query\Grammars
  */
 class DB2Grammar extends Grammar
 {
diff --git a/src/Query/Processors/DB2Processor.php b/src/Database/Query/Processors/DB2Processor.php
similarity index 90%
rename from src/Query/Processors/DB2Processor.php
rename to src/Database/Query/Processors/DB2Processor.php
index a63f8a4..d0ba88f 100644
--- a/src/Query/Processors/DB2Processor.php
+++ b/src/Database/Query/Processors/DB2Processor.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Cooperl\Database\DB2\Query\Processors;
+namespace Cooperl\DB2\Database\Query\Processors;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\Processors\Processor;
-use Cooperl\Database\DB2\Query\Grammars\DB2Grammar;
+use Cooperl\DB2\Database\Query\Grammars\DB2Grammar;
 
 /**
  * Class DB2Processor
  *
- * @package Cooperl\Database\DB2\Query\Processors
+ * @package Cooperl\DB2\Database\Query\Processors
  */
 class DB2Processor extends Processor
 {
diff --git a/src/Query/Processors/DB2ZOSProcessor.php b/src/Database/Query/Processors/DB2ZOSProcessor.php
similarity index 89%
rename from src/Query/Processors/DB2ZOSProcessor.php
rename to src/Database/Query/Processors/DB2ZOSProcessor.php
index 166f14d..861a9e5 100644
--- a/src/Query/Processors/DB2ZOSProcessor.php
+++ b/src/Database/Query/Processors/DB2ZOSProcessor.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Cooperl\Database\DB2\Query\Processors;
+namespace Cooperl\DB2\Database\Query\Processors;
 
 use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\Processors\Processor;
-use Cooperl\Database\DB2\Query\Grammars\DB2Grammar;
+use Cooperl\DB2\Database\Query\Grammars\DB2Grammar;
 
 /**
  * Class DB2ZOSProcessor
  *
- * @package Cooperl\Database\DB2\Query\Processors
+ * @package Cooperl\DB2\Database\Query\Processors
  */
 class DB2ZOSProcessor extends Processor
 {
diff --git a/src/Schema/Blueprint.php b/src/Database/Schema/Blueprint.php
similarity index 98%
rename from src/Schema/Blueprint.php
rename to src/Database/Schema/Blueprint.php
index 6aedfea..fa9cc93 100644
--- a/src/Schema/Blueprint.php
+++ b/src/Database/Schema/Blueprint.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema;
+namespace Cooperl\DB2\Database\Schema;
 
 use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Grammars\Grammar;
@@ -8,7 +8,7 @@ use Illuminate\Database\Schema\Grammars\Grammar;
 /**
  * Class Blueprint
  *
- * @package Cooperl\Database\DB2\Schema
+ * @package Cooperl\DB2\Database\Schema
  */
 class Blueprint extends \Illuminate\Database\Schema\Blueprint
 {
diff --git a/src/Schema/Builder.php b/src/Database/Schema/Builder.php
similarity index 91%
rename from src/Schema/Builder.php
rename to src/Database/Schema/Builder.php
index cfb6210..fc7eab6 100644
--- a/src/Schema/Builder.php
+++ b/src/Database/Schema/Builder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema;
+namespace Cooperl\DB2\Database\Schema;
 
 use Closure;
 use Illuminate\Database\Schema\Blueprint;
@@ -8,7 +8,7 @@ use Illuminate\Database\Schema\Blueprint;
 /**
  * Class Builder
  *
- * @package Cooperl\Database\DB2\Schema
+ * @package Cooperl\DB2\Database\Schema
  */
 class Builder extends \Illuminate\Database\Schema\Builder
 {
@@ -76,7 +76,7 @@ class Builder extends \Illuminate\Database\Schema\Builder
      * @param  string $table
      * @param  \Closure $callback
      *
-     * @return \Cooperl\Database\DB2\Schema\Blueprint
+     * @return \Cooperl\DB2\Database\Schema\Blueprint
      */
     protected function createBlueprint($table, Closure $callback = null)
     {
@@ -84,6 +84,6 @@ class Builder extends \Illuminate\Database\Schema\Builder
             return call_user_func($this->resolver, $table, $callback);
         }
 
-        return new \Cooperl\Database\DB2\Schema\Blueprint($table, $callback);
+        return new \Cooperl\DB2\Database\Schema\Blueprint($table, $callback);
     }
 }
diff --git a/src/Schema/Grammars/DB2ExpressCGrammar.php b/src/Database/Schema/Grammars/DB2ExpressCGrammar.php
similarity index 70%
rename from src/Schema/Grammars/DB2ExpressCGrammar.php
rename to src/Database/Schema/Grammars/DB2ExpressCGrammar.php
index 8f7d1c0..68b766c 100644
--- a/src/Schema/Grammars/DB2ExpressCGrammar.php
+++ b/src/Database/Schema/Grammars/DB2ExpressCGrammar.php
@@ -1,12 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema\Grammars;
-
-use Illuminate\Database\Query\Expression;
-use Illuminate\Support\Fluent;
-use Illuminate\Database\Connection;
-use Illuminate\Database\Schema\Grammars\Grammar;
-use Illuminate\Database\Schema\Blueprint;
+namespace Cooperl\DB2\Database\Schema\Grammars;
 
 class DB2ExpressCGrammar extends DB2Grammar
 {
diff --git a/src/Schema/Grammars/DB2Grammar.php b/src/Database/Schema/Grammars/DB2Grammar.php
similarity index 99%
rename from src/Schema/Grammars/DB2Grammar.php
rename to src/Database/Schema/Grammars/DB2Grammar.php
index 3138e64..0a7a098 100644
--- a/src/Schema/Grammars/DB2Grammar.php
+++ b/src/Database/Schema/Grammars/DB2Grammar.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema\Grammars;
+namespace Cooperl\DB2\Database\Schema\Grammars;
 
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Fluent;
diff --git a/src/Queue/DB2Connector.php b/src/Queue/DB2Connector.php
new file mode 100644
index 0000000..51874e2
--- /dev/null
+++ b/src/Queue/DB2Connector.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Cooperl\DB2\Queue;
+
+use Illuminate\Queue\Connectors\DatabaseConnector;
+
+class DB2Connector extends DatabaseConnector
+{
+    /**
+     * Establish a queue connection.
+     *
+     * @param  array  $config
+     * @return \Illuminate\Contracts\Queue\Queue
+     */
+    public function connect(array $config)
+    {
+        return new DB2Queue(
+            $this->connections->connection($config['connection'] ?? null),
+            $config['table'],
+            $config['queue'],
+            $config['retry_after'] ?? 60
+        );
+    }
+}
diff --git a/src/Queue/DB2Queue.php b/src/Queue/DB2Queue.php
new file mode 100644
index 0000000..616c6cb
--- /dev/null
+++ b/src/Queue/DB2Queue.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Cooperl\DB2\Queue;
+
+use Illuminate\Queue\DatabaseQueue;
+
+class DB2Queue extends DatabaseQueue
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLockForPopping()
+    {
+        return true;
+    }
+
+}