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

Explicit jsonb support for custom pg clients #5201

Merged
merged 7 commits into from Aug 31, 2022
Merged

Explicit jsonb support for custom pg clients #5201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
32e339d
allow custom pg clients to declare explicit jsonb support
viqueen May 27, 2022
5a232b7
let pg clients declare if they have jsonb support or not
viqueen May 30, 2022
9fbca6e
set jsonbSupport to true for cockroach db test clients
viqueen May 30, 2022
27ad14f
bring back the check on cockroachdb client for backwards compat
viqueen Jun 7, 2022
ffa7f6e
welcome custom pg client test with jsonb support
viqueen Jun 9, 2022
9fa16fb
Update lib/dialects/postgres/schema/pg-columncompiler.js
kibertoad Aug 31, 2022
7ca0f2f
Update test/integration2/util/knex-instance-provider.js
kibertoad Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/dialects/postgres/schema/pg-columncompiler.js
View file
Open in desktop
Expand Up @@ -139,6 +139,7 @@ function jsonColumn(client, jsonb) {
if (
!client.version ||
client.config.client === 'cockroachdb' ||
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why was cockroachdb removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brought it back , I removed it initially just to get a sense of the tests in order to eventually replicate them for pg-mem

client.config.jsonbSupport === true ||
parseFloat(client.version) >= 9.2
) {
return jsonb ? 'jsonb' : 'json';
Expand Down
36 changes: 35 additions & 1 deletion test/unit/schema-builder/postgres.js
View file
Open in desktop
Expand Up @@ -93,6 +93,41 @@ describe('PostgreSQL Config', function () {
);
});
});

describe('check custom pg client', function () {
it('jsonb as text', function () {
knexInstance = knex({
...config,
version: 'custom-pg',
jsonbSupport: false,
});
tableSql = knexInstance.schema
.table('public', function (t) {
t.jsonb('test_name');
})
.toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal(
'alter table "public" add column "test_name" text'
);
});
it('jsonb', function () {
knexInstance = knex({
...config,
version: 'custom-pg',
jsonbSupport: true,
});
tableSql = knexInstance.schema
.table('public', function (t) {
t.jsonb('test_name');
})
.toSQL();
equal(1, tableSql.length);
expect(tableSql[0].sql).to.equal(
'alter table "public" add column "test_name" jsonb'
);
});
});
});
});

Expand Down Expand Up @@ -446,7 +481,6 @@ describe('PostgreSQL SchemaBuilder', function () {
);
});


it('refresh view concurrently', function () {
tableSql = client
.schemaBuilder()
Expand Down
1 change: 1 addition & 0 deletions types/index.d.ts
View file
Open in desktop
Expand Up @@ -2310,6 +2310,7 @@ export declare namespace Knex {
debug?: boolean;
client?: string | typeof Client;
dialect?: string;
jsonbSupport?: boolean;
version?: string;
connection?: string | StaticConnectionConfig | ConnectionConfigProvider;
pool?: PoolConfig;
Expand Down