Skip to content

Support range types #127

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.

Sign up for GitHub

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

Merged
bendrucker merged 1 commit into from
Mar 11, 2021
Merged

Support range types #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions lib/textParsers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ const array = require('postgres-array')
const parseTimestampTz = require('postgres-date')
const parseInterval = require('postgres-interval')
const parseByteA = require('postgres-bytea')
const range = require('postgres-range')

function parseBool (value) {
return value === 'TRUE' ||
Expand Down Expand Up @@ -118,6 +119,26 @@ const parseCircle = function (value) {
return result
}

function parseInt4Range (raw) {
return range.parse(raw, parseBaseTenInt)
}

function parseNumRange (raw) {
return range.parse(raw, parseFloat)
}

function parseInt8Range (raw) {
return range.parse(raw, parseBigInteger)
}

function parseTimestampRange (raw) {
return range.parse(raw, parseTimestamp)
}

function parseTimestampTzRange (raw) {
return range.parse(raw, parseTimestampTz)
}

const init = function (register) {
register(20, parseBigInteger) // int8
register(21, parseBaseTenInt) // int2
Expand Down Expand Up @@ -157,7 +178,13 @@ const init = function (register) {
register(3802, JSON.parse) // jsonb
register(199, parseJsonArray) // json[]
register(3807, parseJsonArray) // jsonb[]
register(3904, parseInt4Range) // int4range
register(3906, parseNumRange) // numrange
register(3907, parseStringArray) // numrange[]
register(3908, parseTimestampRange) // tsrange
register(3910, parseTimestampTzRange) // tstzrange
register(3912, range.parse) // daterange
register(3926, parseInt8Range) // int8range
register(2951, parseStringArray) // uuid[]
register(791, parseStringArray) // money[]
register(1183, parseStringArray) // time[]
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"postgres-array": "~3.0.1",
"postgres-bytea": "~3.0.0",
"postgres-date": "~2.0.1",
"postgres-interval": "^3.0.0"
"postgres-interval": "^3.0.0",
"postgres-range": "^1.0.0"
},
"files": [
"index.js",
Expand Down
167 changes: 160 additions & 7 deletions test/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
'use strict'
const PostgresInterval = require('postgres-interval')

const {
Range,
RANGE_EMPTY,
RANGE_LB_INC,
RANGE_LB_INF,
RANGE_UB_INF,
RANGE_UB_INC
} = require('postgres-range')

exports['string/varchar'] = {
format: 'text',
id: 1043,
Expand Down Expand Up @@ -179,13 +188,157 @@ exports.numrange = {
format: 'text',
id: 3906,
tests: [
['[,]', '[,]'],
['(,)', '(,)'],
['(,]', '(,]'],
['[1,)', '[1,)'],
['[,1]', '[,1]'],
['(1,2)', '(1,2)'],
['(1,20.5]', '(1,20.5]']
['empty', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_EMPTY))
}],
['(,)', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_LB_INF | RANGE_UB_INF))
}],
['(1.5,)', function (t, value) {
t.deepEqual(value, new Range(1.5, null, RANGE_UB_INF))
}],
['(,1.5)', function (t, value) {
t.deepEqual(value, new Range(null, 1.5, RANGE_LB_INF))
}],
['(0,5)', function (t, value) {
t.deepEqual(value, new Range(0, 5, 0))
}],
['(,1.5]', function (t, value) {
t.deepEqual(value, new Range(null, 1.5, RANGE_LB_INF | RANGE_UB_INC))
}],
['[1.5,)', function (t, value) {
t.deepEqual(value, new Range(1.5, null, RANGE_LB_INC | RANGE_UB_INF))
}],
['[0,0.5)', function (t, value) {
t.deepEqual(value, new Range(0, 0.5, RANGE_LB_INC))
}],
['(0,0.5]', function (t, value) {
t.deepEqual(value, new Range(0, 0.5, RANGE_UB_INC))
}],
['[0,0.5]', function (t, value) {
t.deepEqual(value, new Range(0, 0.5, RANGE_LB_INC | RANGE_UB_INC))
}]
]
}

exports.int4range = {
format: 'text',
id: 3904,
tests: [
['empty', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_EMPTY))
}],
['(,)', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_LB_INF | RANGE_UB_INF))
}],
['(1,)', function (t, value) {
t.deepEqual(value, new Range(1, null, RANGE_UB_INF))
}],
['(,1)', function (t, value) {
t.deepEqual(value, new Range(null, 1, RANGE_LB_INF))
}],
['(0,5)', function (t, value) {
t.deepEqual(value, new Range(0, 5, 0))
}],
['(,1]', function (t, value) {
t.deepEqual(value, new Range(null, 1, RANGE_LB_INF | RANGE_UB_INC))
}],
['[1,)', function (t, value) {
t.deepEqual(value, new Range(1, null, RANGE_LB_INC | RANGE_UB_INF))
}],
['[0,5)', function (t, value) {
t.deepEqual(value, new Range(0, 5, RANGE_LB_INC))
}],
['(0,5]', function (t, value) {
t.deepEqual(value, new Range(0, 5, RANGE_UB_INC))
}],
['[0,5]', function (t, value) {
t.deepEqual(value, new Range(0, 5, RANGE_LB_INC | RANGE_UB_INC))
}]
]
}

exports.int8range = {
format: 'text',
id: 3926,
tests: [
['empty', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_EMPTY))
}],
['(,)', function (t, value) {
t.deepEqual(value, new Range(null, null, RANGE_LB_INF | RANGE_UB_INF))
}],
['(1,)', function (t, value) {
t.deepEqual(value, new Range('1', null, RANGE_UB_INF))
}],
['(,1)', function (t, value) {
t.deepEqual(value, new Range(null, '1', RANGE_LB_INF))
}],
['(0,5)', function (t, value) {
t.deepEqual(value, new Range('0', '5', 0))
}],
['(,1]', function (t, value) {
t.deepEqual(value, new Range(null, '1', RANGE_LB_INF | RANGE_UB_INC))
}],
['[1,)', function (t, value) {
t.deepEqual(value, new Range('1', null, RANGE_LB_INC | RANGE_UB_INF))
}],
['[0,5)', function (t, value) {
t.deepEqual(value, new Range('0', '5', RANGE_LB_INC))
}],
['(0,5]', function (t, value) {
t.deepEqual(value, new Range('0', '5', RANGE_UB_INC))
}],
['[0,5]', function (t, value) {
t.deepEqual(value, new Range('0', '5', RANGE_LB_INC | RANGE_UB_INC))
}]
]
}

const tsrangeEquals = ([lower, upper]) => {
const timestamp = date => new Date(Date.UTC.apply(Date, date)).toUTCString()
return (t, value) => {
if (lower !== null) {
t.equal(value.lower.toUTCString(), timestamp(lower))
}
if (upper !== null) {
t.equal(value.upper.toUTCString(), timestamp(upper))
}
}
}
exports.tstzrange = {
format: 'text',
id: 3910,
tests: [
['(2010-10-31 14:54:13.74-05:30,)', tsrangeEquals([[2010, 9, 31, 20, 24, 13, 74], null])],
['(,2010-10-31 14:54:13.74-05:30)', tsrangeEquals([null, [2010, 9, 31, 20, 24, 13, 74]])],
['(2010-10-30 10:54:13.74-05:30,2010-10-31 14:54:13.74-05:30)', tsrangeEquals([[2010, 9, 30, 16, 24, 13, 74], [2010, 9, 31, 20, 24, 13, 74]])]
]
}
exports.tsrange = {
format: 'text',
id: 3908,
tests: [
['(2010-10-31 14:54:13.74,)', tsrangeEquals([[2010, 9, 31, 14, 54, 13, 74], null])],
['(2010-10-31 14:54:13.74,infinity)', tsrangeEquals([[2010, 9, 31, 14, 54, 13, 74], null])],
['(,2010-10-31 14:54:13.74)', tsrangeEquals([null, [2010, 9, 31, 14, 54, 13, 74]])],
['(-infinity,2010-10-31 14:54:13.74)', tsrangeEquals([null, [2010, 9, 31, 14, 54, 13, 74]])],
['(2010-10-30 10:54:13.74,2010-10-31 14:54:13.74)', tsrangeEquals([[2010, 9, 30, 10, 54, 13, 74], [2010, 9, 31, 14, 54, 13, 74]])]
]
}
exports.daterange = {
format: 'text',
id: 3912,
tests: [
['(2010-10-31,)', function (t, value) {
t.deepEqual(value, new Range('2010-10-31', null, RANGE_UB_INF))
}],
['(,2010-10-31)', function (t, value) {
t.deepEqual(value, new Range(null, '2010-10-31', RANGE_LB_INF))
}],
['[2010-10-30,2010-10-31]', function (t, value) {
t.deepEqual(value, new Range('2010-10-30', '2010-10-31', RANGE_LB_INC | RANGE_UB_INC))
}]
]
}

Expand Down