mirror of
https://github.com/danog/postgres.git
synced 2024-11-26 20:15:02 +01:00
Remove deprected functions and move casting switch to separate method
This commit is contained in:
Aaron Piotrowski
parent
0ffc33a932
commit
56f3fa8708
@ -83,122 +83,13 @@ class PgSqlResultSet implements ResultSet {
|
||||
throw new FailureException($message);
|
||||
}
|
||||
|
||||
// See https://github.com/postgres/postgres/blob/REL_10_STABLE/src/include/catalog/pg_type.h for OID types.
|
||||
$column = 0;
|
||||
foreach ($result as $key => $value) {
|
||||
if ($value === null) {
|
||||
++$column;
|
||||
$columnCount = \count($result);
|
||||
for ($column = 0; $column < $columnCount; ++$column) {
|
||||
if ($result[$column] === null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
switch ($this->fieldTypes[$column]) {
|
||||
case 16: // bool
|
||||
$result[$key] = $value === 't';
|
||||
break;
|
||||
|
||||
case 20: // int8
|
||||
case 21: // int2
|
||||
case 23: // int4
|
||||
case 26: // oid
|
||||
case 27: // tid
|
||||
case 28: // xid
|
||||
$result[$key] = (int) $result[$key];
|
||||
break;
|
||||
|
||||
case 700: // real
|
||||
case 701: // double-precision
|
||||
$result[$key] = (float) $result[$key];
|
||||
break;
|
||||
|
||||
case 1000: // boolean[]
|
||||
$result[$key] = $this->parser->parse($result[$key], function (string $value): bool {
|
||||
return $value === 't';
|
||||
});
|
||||
break;
|
||||
|
||||
case 1005: // int2[]
|
||||
case 1007: // int4[]
|
||||
case 1010: // tid[]
|
||||
case 1011: // xid[]
|
||||
case 1016: // int8[]
|
||||
case 1028: // oid[]
|
||||
$result[$key] = $this->parser->parse($result[$key], function (string $value): int {
|
||||
return (int) $value;
|
||||
});
|
||||
break;
|
||||
|
||||
case 1021: // real[]
|
||||
case 1022: // double-precision[]
|
||||
$result[$key] = $this->parser->parse($result[$key], function (string $value): float {
|
||||
return (float) $value;
|
||||
});
|
||||
break;
|
||||
|
||||
case 1020: // box[] (semi-colon delimited)
|
||||
$result[$key] = $this->parser->parse($result[$key], null, ';');
|
||||
break;
|
||||
|
||||
case 199: // json[]
|
||||
case 629: // line[]
|
||||
case 651: // cidr[]
|
||||
case 719: // circle[]
|
||||
case 775: // macaddr8[]
|
||||
case 791: // money[]
|
||||
case 1001: // bytea[]
|
||||
case 1002: // char[]
|
||||
case 1003: // name[]
|
||||
case 1006: // int2vector[]
|
||||
case 1008: // regproc[]
|
||||
case 1009: // text[]
|
||||
case 1013: // oidvector[]
|
||||
case 1014: // bpchar[]
|
||||
case 1015: // varchar[]
|
||||
case 1019: // path[]
|
||||
case 1023: // abstime[]
|
||||
case 1024: // realtime[]
|
||||
case 1025: // tinterval[]
|
||||
case 1027: // polygon[]
|
||||
case 1034: // aclitem[]
|
||||
case 1040: // macaddr[]
|
||||
case 1041: // inet[]
|
||||
case 1115: // timestamp[]
|
||||
case 1182: // date[]
|
||||
case 1183: // time[]
|
||||
case 1185: // timestampz[]
|
||||
case 1187: // interval[]
|
||||
case 1231: // numeric[]
|
||||
case 1263: // cstring[]
|
||||
case 1270: // timetz[]
|
||||
case 1561: // bit[]
|
||||
case 1563: // varbit[]
|
||||
case 2201: // refcursor[]
|
||||
case 2207: // regprocedure[]
|
||||
case 2208: // regoper[]
|
||||
case 2209: // regoperator[]
|
||||
case 2210: // regclass[]
|
||||
case 2211: // regtype[]
|
||||
case 2949: // txid_snapshot[]
|
||||
case 2951: // uuid[]
|
||||
case 3221: // pg_lsn[]
|
||||
case 3643: // tsvector[]
|
||||
case 3644: // gtsvector[]
|
||||
case 3645: // tsquery[]
|
||||
case 3735: // regconfig[]
|
||||
case 3770: // regdictionary[]
|
||||
case 3807: // jsonb[]
|
||||
case 3905: // int4range[]
|
||||
case 3907: // numrange[]
|
||||
case 3909: // tsrange[]
|
||||
case 3911: // tstzrange[]
|
||||
case 3913: // daterange[]
|
||||
case 3927: // int8range[]
|
||||
case 4090: // regnamespace[]
|
||||
case 4097: // regrole[]
|
||||
$result[$key] = $this->parser->parse($result[$key]);
|
||||
break;
|
||||
}
|
||||
|
||||
++$column;
|
||||
$result[$column] = $this->cast($column, $result[$column]);
|
||||
}
|
||||
|
||||
if ($this->type === self::FETCH_ARRAY) {
|
||||
@ -221,6 +112,119 @@ class PgSqlResultSet implements ResultSet {
|
||||
throw new \Error("Invalid result fetch type");
|
||||
}
|
||||
|
||||
/**
|
||||
* @see https://github.com/postgres/postgres/blob/REL_10_STABLE/src/include/catalog/pg_type.h for OID types.
|
||||
*
|
||||
* @param int $column
|
||||
* @param string $value
|
||||
*
|
||||
* @return array|bool|float|int Cast value.
|
||||
*
|
||||
* @throws \Amp\Postgres\ParseException
|
||||
*/
|
||||
private function cast(int $column, string $value) {
|
||||
switch ($this->fieldTypes[$column]) {
|
||||
case 16: // bool
|
||||
return $value === 't';
|
||||
|
||||
case 20: // int8
|
||||
case 21: // int2
|
||||
case 23: // int4
|
||||
case 26: // oid
|
||||
case 27: // tid
|
||||
case 28: // xid
|
||||
return (int) $value;
|
||||
|
||||
case 700: // real
|
||||
case 701: // double-precision
|
||||
return (float) $value;
|
||||
|
||||
case 1000: // boolean[]
|
||||
return $this->parser->parse($value, function (string $value): bool {
|
||||
return $value === 't';
|
||||
});
|
||||
|
||||
case 1005: // int2[]
|
||||
case 1007: // int4[]
|
||||
case 1010: // tid[]
|
||||
case 1011: // xid[]
|
||||
case 1016: // int8[]
|
||||
case 1028: // oid[]
|
||||
return $this->parser->parse($value, function (string $value): int {
|
||||
return (int) $value;
|
||||
});
|
||||
|
||||
case 1021: // real[]
|
||||
case 1022: // double-precision[]
|
||||
return $this->parser->parse($value, function (string $value): float {
|
||||
return (float) $value;
|
||||
});
|
||||
|
||||
case 1020: // box[] (semi-colon delimited)
|
||||
return $this->parser->parse($value, null, ';');
|
||||
|
||||
case 199: // json[]
|
||||
case 629: // line[]
|
||||
case 651: // cidr[]
|
||||
case 719: // circle[]
|
||||
case 775: // macaddr8[]
|
||||
case 791: // money[]
|
||||
case 1001: // bytea[]
|
||||
case 1002: // char[]
|
||||
case 1003: // name[]
|
||||
case 1006: // int2vector[]
|
||||
case 1008: // regproc[]
|
||||
case 1009: // text[]
|
||||
case 1013: // oidvector[]
|
||||
case 1014: // bpchar[]
|
||||
case 1015: // varchar[]
|
||||
case 1019: // path[]
|
||||
case 1023: // abstime[]
|
||||
case 1024: // realtime[]
|
||||
case 1025: // tinterval[]
|
||||
case 1027: // polygon[]
|
||||
case 1034: // aclitem[]
|
||||
case 1040: // macaddr[]
|
||||
case 1041: // inet[]
|
||||
case 1115: // timestamp[]
|
||||
case 1182: // date[]
|
||||
case 1183: // time[]
|
||||
case 1185: // timestampz[]
|
||||
case 1187: // interval[]
|
||||
case 1231: // numeric[]
|
||||
case 1263: // cstring[]
|
||||
case 1270: // timetz[]
|
||||
case 1561: // bit[]
|
||||
case 1563: // varbit[]
|
||||
case 2201: // refcursor[]
|
||||
case 2207: // regprocedure[]
|
||||
case 2208: // regoper[]
|
||||
case 2209: // regoperator[]
|
||||
case 2210: // regclass[]
|
||||
case 2211: // regtype[]
|
||||
case 2949: // txid_snapshot[]
|
||||
case 2951: // uuid[]
|
||||
case 3221: // pg_lsn[]
|
||||
case 3643: // tsvector[]
|
||||
case 3644: // gtsvector[]
|
||||
case 3645: // tsquery[]
|
||||
case 3735: // regconfig[]
|
||||
case 3770: // regdictionary[]
|
||||
case 3807: // jsonb[]
|
||||
case 3905: // int4range[]
|
||||
case 3907: // numrange[]
|
||||
case 3909: // tsrange[]
|
||||
case 3911: // tstzrange[]
|
||||
case 3913: // daterange[]
|
||||
case 3927: // int8range[]
|
||||
case 4090: // regnamespace[]
|
||||
case 4097: // regrole[]
|
||||
return $this->parser->parse($value);
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return int Number of rows in the result set.
|
||||
*/
|
||||
@ -266,53 +270,4 @@ class PgSqlResultSet implements ResultSet {
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated \pg_field_type() performs a blocking query, so this method will be removed in a future version.
|
||||
*
|
||||
* @param int|string $fieldNameOrNum Field name or index.
|
||||
*
|
||||
* @return string Name of the field type.
|
||||
*
|
||||
* @throws \Error If the field number does not exist in the result.
|
||||
*/
|
||||
public function fieldType($fieldNameOrNum): string {
|
||||
return \pg_field_type($this->handle, $this->filterNameOrNum($fieldNameOrNum));
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated Will be removed in a future version.
|
||||
*
|
||||
* @param int|string $fieldNameOrNum Field name or index.
|
||||
*
|
||||
* @return int Storage required for field. -1 indicates a variable length field.
|
||||
*
|
||||
* @throws \Error If the field number does not exist in the result.
|
||||
*/
|
||||
public function fieldSize($fieldNameOrNum): int {
|
||||
return \pg_field_size($this->handle, $this->filterNameOrNum($fieldNameOrNum));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int|string $fieldNameOrNum Field name or index.
|
||||
*
|
||||
* @return int Field index.
|
||||
*
|
||||
* @throws \Error
|
||||
*/
|
||||
private function filterNameOrNum($fieldNameOrNum): int {
|
||||
if (\is_string($fieldNameOrNum)) {
|
||||
return $this->fieldNum($fieldNameOrNum);
|
||||
}
|
||||
|
||||
if (!\is_int($fieldNameOrNum)) {
|
||||
throw new \Error('Must provide a string name or integer field number');
|
||||
}
|
||||
|
||||
if (0 > $fieldNameOrNum || $this->numFields() <= $fieldNameOrNum) {
|
||||
throw new \Error(\sprintf('No field with index %d in result', $fieldNameOrNum));
|
||||
}
|
||||
|
||||
return $fieldNameOrNum;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user