Skip to content

Use INT4 type alias for CockroachDB JDBC compatibility #2485

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

Open
sathesuraj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use INT4 type alias for CockroachDB JDBC compatibility #2485

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
14 changes: 7 additions & 7 deletions persistence/relational-jdbc/src/main/resources/postgres/schema-v1.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ SET search_path TO POLARIS_SCHEMA;

CREATE TABLE IF NOT EXISTS version (
version_key TEXT PRIMARY KEY,
version_value INTEGER NOT NULL
version_value INT4 NOT NULL
Copy link
Contributor

@singhpk234 singhpk234 Sep 2, 2025

Choose a reason for hiding this comment

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

seems like cocroach-db uses pg driver as we have checks for the display type here
https://github.com/apache/polaris/blob/main/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatabaseType.java#L46

would be nice to have a comment.

Copy link
Author

@sathesuraj sathesuraj Sep 2, 2025

Choose a reason for hiding this comment

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

Yes, cockroach DB uses pg driver. I'll add a comment for it.

);
INSERT INTO version (version_key, version_value)
VALUES ('version', 1)
Expand All @@ -35,17 +35,17 @@ CREATE TABLE IF NOT EXISTS entities (
id BIGINT NOT NULL,
parent_id BIGINT NOT NULL,
name TEXT NOT NULL,
entity_version INT NOT NULL,
type_code INT NOT NULL,
sub_type_code INT NOT NULL,
entity_version INT4 NOT NULL,
type_code INT4 NOT NULL,
sub_type_code INT4 NOT NULL,
create_timestamp BIGINT NOT NULL,
drop_timestamp BIGINT NOT NULL,
purge_timestamp BIGINT NOT NULL,
to_purge_timestamp BIGINT NOT NULL,
last_update_timestamp BIGINT NOT NULL,
properties JSONB not null default '{}'::JSONB,
internal_properties JSONB not null default '{}'::JSONB,
grant_records_version INT NOT NULL,
grant_records_version INT4 NOT NULL,
PRIMARY KEY (realm_id, id),
CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
);
Expand Down Expand Up @@ -77,7 +77,7 @@ CREATE TABLE IF NOT EXISTS grant_records (
securable_id BIGINT NOT NULL,
grantee_catalog_id BIGINT NOT NULL,
grantee_id BIGINT NOT NULL,
privilege_code INTEGER,
privilege_code INT4,
PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
);

Expand Down Expand Up @@ -106,7 +106,7 @@ CREATE TABLE IF NOT EXISTS policy_mapping_record (
realm_id TEXT NOT NULL,
target_catalog_id BIGINT NOT NULL,
target_id BIGINT NOT NULL,
policy_type_code INTEGER NOT NULL,
policy_type_code INT4 NOT NULL,
policy_catalog_id BIGINT NOT NULL,
policy_id BIGINT NOT NULL,
parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
Expand Down
14 changes: 7 additions & 7 deletions persistence/relational-jdbc/src/main/resources/postgres/schema-v2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SET search_path TO POLARIS_SCHEMA;

CREATE TABLE IF NOT EXISTS version (
version_key TEXT PRIMARY KEY,
version_value INTEGER NOT NULL
version_value INT4 NOT NULL
);
INSERT INTO version (version_key, version_value)
VALUES ('version', 2)
Expand All @@ -39,17 +39,17 @@ CREATE TABLE IF NOT EXISTS entities (
id BIGINT NOT NULL,
parent_id BIGINT NOT NULL,
name TEXT NOT NULL,
entity_version INT NOT NULL,
type_code INT NOT NULL,
sub_type_code INT NOT NULL,
entity_version INT4 NOT NULL,
type_code INT4 NOT NULL,
sub_type_code INT4 NOT NULL,
create_timestamp BIGINT NOT NULL,
drop_timestamp BIGINT NOT NULL,
purge_timestamp BIGINT NOT NULL,
to_purge_timestamp BIGINT NOT NULL,
last_update_timestamp BIGINT NOT NULL,
properties JSONB not null default '{}'::JSONB,
internal_properties JSONB not null default '{}'::JSONB,
grant_records_version INT NOT NULL,
grant_records_version INT4 NOT NULL,
location_without_scheme TEXT,
PRIMARY KEY (realm_id, id),
CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
Expand Down Expand Up @@ -85,7 +85,7 @@ CREATE TABLE IF NOT EXISTS grant_records (
securable_id BIGINT NOT NULL,
grantee_catalog_id BIGINT NOT NULL,
grantee_id BIGINT NOT NULL,
privilege_code INTEGER,
privilege_code INT4,
PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
);

Expand Down Expand Up @@ -114,7 +114,7 @@ CREATE TABLE IF NOT EXISTS policy_mapping_record (
realm_id TEXT NOT NULL,
target_catalog_id BIGINT NOT NULL,
target_id BIGINT NOT NULL,
policy_type_code INTEGER NOT NULL,
policy_type_code INT4 NOT NULL,
policy_catalog_id BIGINT NOT NULL,
policy_id BIGINT NOT NULL,
parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
Expand Down