Merge pull request #21 from akrabat/os400

Support PHP_OS of OS400 & tweak doModifyLimitQuery
SeidenGroup · Oct 13, 2021 · 4478ff2 · 4478ff2
2 parents 962e248 + 4f46035
commit 4478ff2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/src/Driver/AbstractDB2Driver.php b/src/Driver/AbstractDB2Driver.php
@@ -11,6 +11,12 @@
 abstract class AbstractDB2Driver implements Driver
 {
     const SYSTEM_IBMI = 'AIX';
+    const SYSTEM_IBMI_OS400 = 'OS400';
+
+    public static function isIbmi()
+    {
+        return (PHP_OS === static::SYSTEM_IBMI || PHP_OS === static::SYSTEM_IBMI_OS400);
+    }
 
     /**
      * {@inheritdoc}
@@ -27,7 +33,7 @@ public function getDatabase(\Doctrine\DBAL\Connection $conn)
      */
     public function getDatabasePlatform()
     {
-        if (PHP_OS === static::SYSTEM_IBMI) {
+        if (static::isIbmi()) {
             return new DB2IBMiPlatform();
         } else {
             return new DB2Platform();
@@ -39,7 +45,7 @@ public function getDatabasePlatform()
      */
     public function getSchemaManager(\Doctrine\DBAL\Connection $conn)
     {
-        if (PHP_OS === static::SYSTEM_IBMI) {
+        if (static::isIbmi()) {
             return new DB2IBMiSchemaManager($conn);
         } else {
             return new DB2LUWSchemaManager($conn);

diff --git a/src/Driver/DB2Driver.php b/src/Driver/DB2Driver.php
@@ -31,7 +31,7 @@ public function connect(array $params, $username = null, $password = null, array
             $password = null;
         }
 
-        if (PHP_OS === static::SYSTEM_IBMI) {
+        if (static::isIbmi()) {
             return new DB2IBMiConnection($params, $username, $password, $driverOptions);
         } else {
             return new DB2Connection($params, $username, $password, $driverOptions);

diff --git a/src/Platform/DB2IBMiPlatform.php b/src/Platform/DB2IBMiPlatform.php
@@ -219,7 +219,7 @@ public function getCreateDatabaseSQL($database)
      */
     protected function doModifyLimitQuery($query, $limit, $offset = null)
     {
-        if ($limit === null && $offset === null) {
+        if ($limit === null && $offset <= 0) {
             return $query;
         }