Skip to content
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

Jump to bottom

feat: Adding IT for date and commit timestamp #1621

Merged
merged 9 commits into from
Apr 29, 2022
Merged

feat: Adding IT for date and commit timestamp #1621

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9fee9e8
Revert "fix(deps): update dependency grpc-gcp to ^0.4.0 (#1603)"
asthamohta Apr 18, 2022
241df93
changes to grpc-js
asthamohta Apr 19, 2022
6b50401
Merge branch 'main' into main
asthamohta Apr 19, 2022
ce2b3ae
Merge branch 'googleapis:main' into main
asthamohta Apr 26, 2022
6112321
adding data and commit timestamp
asthamohta Mar 24, 2022
65b779e
changes to endpoint
asthamohta Apr 26, 2022
f4c969d
fix
asthamohta Apr 26, 2022
906a323
changes for emulator
asthamohta Apr 26, 2022
d731b90
Merge branch 'googleapis:main' into pg-date-timestamp
asthamohta Apr 26, 2022
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
143 changes: 102 additions & 41 deletions system-test/spanner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,16 @@ describe('Spanner', () => {
`
CREATE TABLE ${TABLE_NAME}
(
"Key" VARCHAR NOT NULL PRIMARY KEY,
"BytesValue" BYTEA,
"BoolValue" BOOL,
"FloatValue" DOUBLE PRECISION,
"IntValue" BIGINT,
"NumericValue" NUMERIC,
"StringValue" VARCHAR,
"TimestampValue" TIMESTAMPTZ
"Key" VARCHAR NOT NULL PRIMARY KEY,
"BytesValue" BYTEA,
"BoolValue" BOOL,
"FloatValue" DOUBLE PRECISION,
"IntValue" BIGINT,
"NumericValue" NUMERIC,
"StringValue" VARCHAR,
"TimestampValue" TIMESTAMPTZ,
"DateValue" DATE,
"CommitTimestamp" SPANNER.COMMIT_TIMESTAMP
);
`
);
Expand Down Expand Up @@ -1113,22 +1115,45 @@ describe('Spanner', () => {
});

describe('dates', () => {
it('GOOGLE_STANDARD_SQL should write date values', done => {
const date = Spanner.date();

insert({DateValue: date}, Spanner.GOOGLE_STANDARD_SQL, (err, row) => {
const dateInsert = (done, dialect) => {
insert({DateValue: Spanner.date()}, dialect, (err, row) => {
assert.ifError(err);
assert.deepStrictEqual(Spanner.date(row.toJSON().DateValue), date);
assert.deepStrictEqual(
Spanner.date(row.toJSON().DateValue),
Spanner.date()
);
done();
});
};

it('GOOGLE_STANDARD_SQL should write date values', done => {
dateInsert(done, Spanner.GOOGLE_STANDARD_SQL);
});

it('GOOGLE_STANDARD_SQL should write null date values', done => {
insert({DateValue: null}, Spanner.GOOGLE_STANDARD_SQL, (err, row) => {
it('POSTGRESQL should write date values', function (done) {
if (IS_EMULATOR_ENABLED) {
this.skip();
}
dateInsert(done, Spanner.POSTGRESQL);
});

const dateInsertNull = (done, dialect) => {
insert({DateValue: null}, dialect, (err, row) => {
assert.ifError(err);
assert.strictEqual(row.toJSON().DateValue, null);
done();
});
};

it('GOOGLE_STANDARD_SQL should write null date values', done => {
dateInsertNull(done, Spanner.GOOGLE_STANDARD_SQL);
});

it('POSTGRESQL should write null date values', function (done) {
if (IS_EMULATOR_ENABLED) {
this.skip();
}
dateInsertNull(done, Spanner.POSTGRESQL);
});

it('GOOGLE_STANDARD_SQL should write empty date array values', done => {
Expand Down Expand Up @@ -1160,22 +1185,29 @@ describe('Spanner', () => {
});

describe('commit timestamp', () => {
it('GOOGLE_STANDARD_SQL should accept the commit timestamp placeholder', done => {
const commitTimestamp = (done, dialect) => {
const data = {CommitTimestamp: Spanner.COMMIT_TIMESTAMP};

insert(
data,
Spanner.GOOGLE_STANDARD_SQL,
(err, row, {commitTimestamp}) => {
assert.ifError(err);
insert(data, dialect, (err, row, {commitTimestamp}) => {
assert.ifError(err);

const timestampFromCommit = Spanner.timestamp(commitTimestamp);
const timestampFromRead = row.toJSON().CommitTimestamp;
const timestampFromCommit = Spanner.timestamp(commitTimestamp);
const timestampFromRead = row.toJSON().CommitTimestamp;

assert.deepStrictEqual(timestampFromCommit, timestampFromRead);
done();
}
);
assert.deepStrictEqual(timestampFromCommit, timestampFromRead);
done();
});
};

it('GOOGLE_STANDARD_SQL should accept the commit timestamp placeholder', done => {
commitTimestamp(done, Spanner.GOOGLE_STANDARD_SQL);
});

it('POSTGRESQL should accept the commit timestamp placeholder', function (done) {
if (IS_EMULATOR_ENABLED) {
this.skip();
}
commitTimestamp(done, Spanner.POSTGRESQL);
});
});

Expand Down Expand Up @@ -3861,24 +3893,42 @@ describe('Spanner', () => {
});

describe('date', () => {
const dateQuery = (done, database, query, value) => {
database.run(query, (err, rows) => {
assert.ifError(err);

let returnedDate = Spanner.date(rows[0][0].value);
if (value === null) {
returnedDate = rows[0][0].value;
}
assert.deepStrictEqual(returnedDate, value);
done();
});
};

it('GOOGLE_STANDARD_SQL should bind the value', done => {
const date = Spanner.date();

const query = {
sql: 'SELECT @v',
params: {
v: date,
},
};
dateQuery(done, DATABASE, query, date);
});

DATABASE.run(query, (err, rows) => {
assert.ifError(err);

const returnedDate = Spanner.date(rows[0][0].value);
assert.deepStrictEqual(returnedDate, date);

done();
});
it('POSTGRESQL should bind the value', function (done) {
if (IS_EMULATOR_ENABLED) {
this.skip();
}
const date = Spanner.date();
const query = {
sql: 'SELECT $1',
params: {
p1: date,
},
};
dateQuery(done, PG_DATABASE, query, date);
});

it('GOOGLE_STANDARD_SQL should allow for null values', done => {
Expand All @@ -3891,12 +3941,23 @@ describe('Spanner', () => {
v: 'date',
},
};
dateQuery(done, DATABASE, query, null);
});

DATABASE.run(query, (err, rows) => {
assert.ifError(err);
assert.strictEqual(rows[0][0].value, null);
done();
});
it('POSTGRESQL should allow for null values', function (done) {
if (IS_EMULATOR_ENABLED) {
this.skip();
}
const query = {
sql: 'SELECT $1',
params: {
p1: null,
},
types: {
p1: 'date',
},
};
dateQuery(done, PG_DATABASE, query, null);
});

it('GOOGLE_STANDARD_SQL should bind arrays', done => {
Expand Down