NEW: Queue managing with DB2 ODBC connections

cooperl22 · cooperl22 · commit 8ee8a02237b1 · 2020-09-25T12:13:45.000+02:00
diff --git 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
@@ -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 @@ public function register()
                 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/Database/Connectors/DB2Connector.php b/src/Database/Connectors/DB2Connector.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Cooperl\Database\DB2\Connectors;
+namespace Cooperl\DB2\Database\Connectors;
 
 use Illuminate\Database\Connectors\Connector;
 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/Database/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/Database/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/Database/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/Database/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 @@ public function executeCommand($command)
     /**
      * 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 @@ protected function getDefaultSchemaGrammar()
     /**
      * 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/Database/Query/Grammars/DB2Grammar.php b/src/Database/Query/Grammars/DB2Grammar.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Cooperl\Database\DB2\Query\Grammars;
+namespace Cooperl\DB2\Database\Query\Grammars;
 
 use Illuminate\Database\Query\Grammars\Grammar;
 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/Database/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/Database/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/Database/Schema/Blueprint.php b/src/Database/Schema/Blueprint.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema;
+namespace Cooperl\DB2\Database\Schema;
 
 use Illuminate\Database\Connection;
 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/Database/Schema/Builder.php b/src/Database/Schema/Builder.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Cooperl\Database\DB2\Schema;
+namespace Cooperl\DB2\Database\Schema;
 
 use Closure;
 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,14 +76,14 @@ protected function build(Blueprint $blueprint)
      * @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)
     {
         if (isset($this->resolver)) {
             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/Database/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/Database/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
@@ -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
@@ -0,0 +1,18 @@
+<?php
+
+namespace Cooperl\DB2\Queue;
+
+use Illuminate\Queue\DatabaseQueue;
+
+class DB2Queue extends DatabaseQueue
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getLockForPopping()
+    {
+        return true;
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -16,20 +16,20 @@`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"require": {`
`19`		`- "php": "^7.2.5",`
`20`		`- "illuminate/database": "^7.0"`
	`19`	`+ "php": "^7.2",`
	`20`	`+ "illuminate/database": "^6.0"`
`21`	`21`	`},`
`22`	`22`	`"require-dev": {`
`23`	`23`	`},`
`24`	`24`	`"autoload": {`
`25`	`25`	`"psr-4": {`
`26`		`- "Cooperl\\Database\\DB2\\": "src/"`
	`26`	`+ "Cooperl\\DB2\\": "src/"`
`27`	`27`	`}`
`28`	`28`	`},`
`29`	`29`	`"extra": {`
`30`	`30`	`"laravel": {`
`31`	`31`	`"providers": [`
`32`		`- "Cooperl\\Database\\DB2\\DB2ServiceProvider"`
	`32`	`+ "Cooperl\\DB2\\DB2ServiceProvider"`
`33`	`33`	`]`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Cooperl\Database\DB2\Connectors;`
	`3`	`+namespace Cooperl\DB2\Database\Connectors;`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Connectors\Connector;`
`6`	`6`	`use Illuminate\Database\Connectors\ConnectorInterface;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Class IBMConnector`
`10`	`10`	`*`
`11`		`- * @package Cooperl\Database\DB2\Connectors`
	`11`	`+ * @package Cooperl\DB2\Database\Connectors`
`12`	`12`	`*/`
`13`	`13`	`class DB2Connector extends Connector implements ConnectorInterface`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Cooperl\Database\DB2\Connectors;`
	`3`	`+namespace Cooperl\DB2\Database\Connectors;`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* Class IBMConnector`
`7`	`7`	`*`
`8`		`- * @package Cooperl\Database\DB2\Connectors`
	`8`	`+ * @package Cooperl\DB2\Database\Connectors`
`9`	`9`	`*/`
`10`	`10`	`class IBMConnector extends DB2Connector`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace Cooperl\Database\DB2\Query\Grammars;`
	`3`	`+namespace Cooperl\DB2\Database\Query\Grammars;`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Query\Grammars\Grammar;`
`6`	`6`	`use Illuminate\Database\Query\Builder;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Class DB2Grammar`
`10`	`10`	`*`
`11`		`- * @package Cooperl\Database\DB2\Query\Grammars`
	`11`	`+ * @package Cooperl\DB2\Database\Query\Grammars`
`12`	`12`	`*/`
`13`	`13`	`class DB2Grammar extends Grammar`
`14`	`14`	`{`