Skip to content

Add support for point and point array type #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions decode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,31 @@ function decodeBinary() {
throw new Error("Not implemented!");
}

// Ported from https://github.com/brianc/node-pg-types
// The MIT License (MIT)
//
// Copyright (c) 2014 Brian M. Carlson
//
// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
function decodePoint(value: string): unknown {
if (value[0] !== "(") return null;

const [x, y] = value.substring(1, value.length - 1).split(",");

return {
x: parseFloat(x),
y: parseFloat(y),
};
}

function decodePointArray(value: string): unknown[] {
return parseArray(value, decodePoint);
}

const HEX = 16;
const BACKSLASH_BYTE_VALUE = 92;
const HEX_PREFIX_REGEX = /^\\x/;
Expand Down Expand Up @@ -260,6 +285,10 @@ function decodeText(value: Uint8Array, typeOid: number): any {
case Oid.json_array:
case Oid.jsonb_array:
return decodeJsonArray(strValue);
case Oid.point:
return decodePoint(strValue);
case Oid._point:
return decodePointArray(strValue);
case Oid.bytea:
return decodeBytea(strValue);
default:
Expand Down
16 changes: 16 additions & 0 deletions tests/data_types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,19 @@ testClient(async function jsonArray() {
],
);
});

testClient(async function point() {
const selectRes = await CLIENT.query(
"SELECT point(1, 2)",
);
assertEquals(selectRes.rows, [[{ x: 1, y: 2 }]]);
});

testClient(async function pointArray() {
const selectRes = await CLIENT.query(
`SELECT '{"(1, 2)","(3.5, 4.1)"}'::point[]`,
);
assertEquals(selectRes.rows, [
[[{ x: 1, y: 2 }, { x: 3.5, y: 4.1 }]],
]);
});