diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php index f90be95e..771f8248 100644 --- a/src/Dibi/Drivers/MySqliDriver.php +++ b/src/Dibi/Drivers/MySqliDriver.php @@ -331,7 +331,7 @@ class MySqliDriver implements Dibi\Driver } elseif ($limit !== null || $offset) { // see http://dev.mysql.com/doc/refman/5.0/en/select.html - $sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : $limit) + $sql .= ' LIMIT ' . ($limit ?? '18446744073709551615') . ($offset ? ' OFFSET ' . $offset : ''); } } diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php index f9117a70..d35e1265 100644 --- a/src/Dibi/Drivers/PdoDriver.php +++ b/src/Dibi/Drivers/PdoDriver.php @@ -367,7 +367,7 @@ class PdoDriver implements Dibi\Driver case 'mysql': if ($limit !== null || $offset) { // see http://dev.mysql.com/doc/refman/5.0/en/select.html - $sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : $limit) + $sql .= ' LIMIT ' . ($limit ?? '18446744073709551615') . ($offset ? ' OFFSET ' . $offset : ''); } break; @@ -383,7 +383,7 @@ class PdoDriver implements Dibi\Driver case 'sqlite': if ($limit !== null || $offset) { - $sql .= ' LIMIT ' . ($limit === null ? '-1' : $limit) + $sql .= ' LIMIT ' . ($limit ?? '-1') . ($offset ? ' OFFSET ' . $offset : ''); } break; diff --git a/src/Dibi/Drivers/SqliteDriver.php b/src/Dibi/Drivers/SqliteDriver.php index 55886c5f..db900797 100644 --- a/src/Dibi/Drivers/SqliteDriver.php +++ b/src/Dibi/Drivers/SqliteDriver.php @@ -267,7 +267,7 @@ class SqliteDriver implements Dibi\Driver throw new Dibi\NotSupportedException('Negative offset or limit.'); } elseif ($limit !== null || $offset) { - $sql .= ' LIMIT ' . ($limit === null ? '-1' : $limit) + $sql .= ' LIMIT ' . ($limit ?? '-1') . ($offset ? ' OFFSET ' . $offset : ''); } }