Skip to content

Commit d979256

Browse files
committed
build all
1 parent 5602e57 commit d979256

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

api.include.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5335,13 +5335,13 @@ private function convertRecordValue($conversion, $value)
53355335

53365336
private function getRecordValueConversion(ReflectedColumn $column): string
53375337
{
5338-
if (in_array($this->driver, ['mysql', 'sqlsrv', 'sqlite']) && $column->isBoolean()) {
5338+
if ($column->isBoolean()) {
53395339
return 'boolean';
53405340
}
5341-
if (in_array($this->driver, ['sqlsrv', 'sqlite']) && in_array($column->getType(), ['integer', 'bigint'])) {
5341+
if (in_array($column->getType(), ['integer', 'bigint'])) {
53425342
return 'integer';
53435343
}
5344-
if (in_array($this->driver, ['sqlite', 'pgsql']) && in_array($column->getType(), ['float', 'double'])) {
5344+
if (in_array($column->getType(), ['float', 'double'])) {
53455345
return 'float';
53465346
}
53475347
if (in_array($this->driver, ['sqlite']) && in_array($column->getType(), ['decimal'])) {
@@ -5475,20 +5475,15 @@ private function getOptions(): array
54755475
switch ($this->driver) {
54765476
case 'mysql':
54775477
return $options + [
5478-
\PDO::ATTR_EMULATE_PREPARES => false,
54795478
\PDO::MYSQL_ATTR_FOUND_ROWS => true,
54805479
\PDO::ATTR_PERSISTENT => true,
54815480
];
54825481
case 'pgsql':
54835482
return $options + [
5484-
\PDO::ATTR_EMULATE_PREPARES => false,
54855483
\PDO::ATTR_PERSISTENT => true,
54865484
];
54875485
case 'sqlsrv':
5488-
return $options + [
5489-
\PDO::SQLSRV_ATTR_DIRECT_QUERY => false,
5490-
\PDO::SQLSRV_ATTR_FETCHES_NUMERIC_TYPE => true,
5491-
];
5486+
return $options + [];
54925487
case 'sqlite':
54935488
return $options + [];
54945489
}
@@ -5618,10 +5613,10 @@ public function createSingle(ReflectedTable $table, array $columnValues) /*: ?St
56185613
break;
56195614
}
56205615
$pkValue = $stmt->fetchColumn(0);
5621-
if ($this->driver == 'sqlsrv' && $table->getPk()->getType() == 'bigint') {
5616+
if ($table->getPk()->getType() == 'bigint') {
56225617
return (int) $pkValue;
56235618
}
5624-
if ($this->driver == 'sqlite' && in_array($table->getPk()->getType(), ['integer', 'bigint'])) {
5619+
if (in_array($table->getPk()->getType(), ['integer', 'bigint'])) {
56255620
return (int) $pkValue;
56265621
}
56275622
return $pkValue;
@@ -5753,7 +5748,7 @@ public function ping(): int
57535748
$start = microtime(true);
57545749
$stmt = $this->pdo->prepare('SELECT 1');
57555750
$stmt->execute();
5756-
return intval((microtime(true)-$start)*1000000);
5751+
return intval((microtime(true) - $start) * 1000000);
57575752
}
57585753

57595754
public function getCacheKey(): string

api.php

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5335,13 +5335,13 @@ private function convertRecordValue($conversion, $value)
53355335

53365336
private function getRecordValueConversion(ReflectedColumn $column): string
53375337
{
5338-
if (in_array($this->driver, ['mysql', 'sqlsrv', 'sqlite']) && $column->isBoolean()) {
5338+
if ($column->isBoolean()) {
53395339
return 'boolean';
53405340
}
5341-
if (in_array($this->driver, ['sqlsrv', 'sqlite']) && in_array($column->getType(), ['integer', 'bigint'])) {
5341+
if (in_array($column->getType(), ['integer', 'bigint'])) {
53425342
return 'integer';
53435343
}
5344-
if (in_array($this->driver, ['sqlite', 'pgsql']) && in_array($column->getType(), ['float', 'double'])) {
5344+
if (in_array($column->getType(), ['float', 'double'])) {
53455345
return 'float';
53465346
}
53475347
if (in_array($this->driver, ['sqlite']) && in_array($column->getType(), ['decimal'])) {
@@ -5475,20 +5475,15 @@ private function getOptions(): array
54755475
switch ($this->driver) {
54765476
case 'mysql':
54775477
return $options + [
5478-
\PDO::ATTR_EMULATE_PREPARES => false,
54795478
\PDO::MYSQL_ATTR_FOUND_ROWS => true,
54805479
\PDO::ATTR_PERSISTENT => true,
54815480
];
54825481
case 'pgsql':
54835482
return $options + [
5484-
\PDO::ATTR_EMULATE_PREPARES => false,
54855483
\PDO::ATTR_PERSISTENT => true,
54865484
];
54875485
case 'sqlsrv':
5488-
return $options + [
5489-
\PDO::SQLSRV_ATTR_DIRECT_QUERY => false,
5490-
\PDO::SQLSRV_ATTR_FETCHES_NUMERIC_TYPE => true,
5491-
];
5486+
return $options + [];
54925487
case 'sqlite':
54935488
return $options + [];
54945489
}
@@ -5618,10 +5613,10 @@ public function createSingle(ReflectedTable $table, array $columnValues) /*: ?St
56185613
break;
56195614
}
56205615
$pkValue = $stmt->fetchColumn(0);
5621-
if ($this->driver == 'sqlsrv' && $table->getPk()->getType() == 'bigint') {
5616+
if ($table->getPk()->getType() == 'bigint') {
56225617
return (int) $pkValue;
56235618
}
5624-
if ($this->driver == 'sqlite' && in_array($table->getPk()->getType(), ['integer', 'bigint'])) {
5619+
if (in_array($table->getPk()->getType(), ['integer', 'bigint'])) {
56255620
return (int) $pkValue;
56265621
}
56275622
return $pkValue;
@@ -5753,7 +5748,7 @@ public function ping(): int
57535748
$start = microtime(true);
57545749
$stmt = $this->pdo->prepare('SELECT 1');
57555750
$stmt->execute();
5756-
return intval((microtime(true)-$start)*1000000);
5751+
return intval((microtime(true) - $start) * 1000000);
57575752
}
57585753

57595754
public function getCacheKey(): string

0 commit comments

Comments
 (0)