1
0
mirror of https://github.com/dg/dibi.git synced 2025-09-01 18:12:51 +02:00

Compare commits

..

5 Commits

Author SHA1 Message Date
David Grudl
9d4bef53d3 travis: added PHP 7.4 2019-11-19 20:15:32 +01:00
David Grudl
1db63d81e9 fixes for PHP 7.4 2019-11-19 01:49:22 +01:00
Adam Klvač
c7dee4d822 SqlsrvResult: fixed illegal false return value from sqlsrv_fetch_array() (#344)
On error, sqlsrv_fetch_array() returns false, which causes an error due to the return type declaration. This commit handles that by casting such value to null the same way other result drivers do it.
2019-11-19 01:30:34 +01:00
Miloslav Hůla
f2927a1b08 OracleResult: LONG type is textual [Closes #342] (#343) 2019-11-06 16:43:33 +01:00
David Grudl
b5a66fdb26 typo 2019-10-22 19:39:16 +02:00
6 changed files with 6 additions and 4 deletions

View File

@@ -3,6 +3,7 @@ php:
- 7.1
- 7.2
- 7.3
- 7.4
services:
- mysql

View File

@@ -26,7 +26,7 @@ Install Dibi via Composer:
composer require dibi/dibi
```
The Dibi 4.0 requires PHP version 7.1 and supports PHP up to 7.2. Older Dibi 3.x requires PHP 5.4 and supports PHP up to 7.2.
The Dibi 4.1 requires PHP version 7.1 and supports PHP up to 7.4.
Usage

View File

@@ -96,6 +96,7 @@ class OracleResult implements Dibi\ResultDriver
'name' => oci_field_name($this->resultSet, $i),
'table' => null,
'fullname' => oci_field_name($this->resultSet, $i),
'type' => $type === 'LONG' ? Dibi\Type::TEXT : null,
'nativetype' => $type === 'NUMBER' && oci_field_scale($this->resultSet, $i) === 0 ? 'INTEGER' : $type,
];
}

View File

@@ -61,7 +61,7 @@ class SqlsrvResult implements Dibi\ResultDriver
*/
public function fetch(bool $assoc): ?array
{
return sqlsrv_fetch_array($this->resultSet, $assoc ? SQLSRV_FETCH_ASSOC : SQLSRV_FETCH_NUMERIC);
return Dibi\Helpers::false2Null(sqlsrv_fetch_array($this->resultSet, $assoc ? SQLSRV_FETCH_ASSOC : SQLSRV_FETCH_NUMERIC));
}

View File

@@ -423,7 +423,7 @@ class Fluent implements IDataSource
if ($clause === null) {
$data = $this->clauses;
if ($this->command === 'SELECT' && ($data['LIMIT'] || $data['OFFSET'])) {
$args = array_merge(['%lmt %ofs', $data['LIMIT'][0], $data['OFFSET'][0]], $args);
$args = array_merge(['%lmt %ofs', $data['LIMIT'][0] ?? null, $data['OFFSET'][0] ?? null], $args);
unset($data['LIMIT'], $data['OFFSET']);
}

View File

@@ -28,7 +28,7 @@ class Result
/** @var Column[]|null */
private $columns;
/** @var string[]|null */
/** @var Column[]|null */
private $names;