Skip to content

fix: correctly handle integer -> bigint conversion #736

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
levkk merged 2 commits into from
Jan 31, 2026
Merged

fix: correctly handle integer -> bigint conversion #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f1ca34
fix: correctly handle integer -> bigint conversion
levkk Jan 31, 2026
56d2278
letsgoo
levkk Jan 31, 2026
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: 136 additions & 7 deletions integration/schema_sync/dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#!/bin/bash
set -e
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
PGDOG_BIN_PATH="${PGDOG_BIN:-${SCRIPT_DIR}/../../target/release/pgdog}"
PGDOG_BIN_PATH="${PGDOG_BIN:-${SCRIPT_DIR}/../../target/debug/pgdog}"
pushd ${SCRIPT_DIR}

dropdb pgdog1 || true
dropdb pgdog2 || true
createdb pgdog1
createdb pgdog2

export PGPASSWORD=pgdog
export PGUSER=pgdog
export PGHOST=127.0.0.1
Expand Down Expand Up @@ -46,26 +51,150 @@ for f in source.sql destination.sql; do
sed -i.bak '/^\\unrestrict.*$/d' $f
done

# Expected content changes (without line numbers for portability)
EXPECTED_CHANGES=$(cat <<EOF
# Expected content changes for PostgreSQL < 15 (no named NOT NULL constraints)
EXPECTED_PG14=$(cat <<EOF
< document_id integer NOT NULL,
> document_id bigint NOT NULL,
< event_id integer NOT NULL,
> event_id bigint NOT NULL,
< flag_id integer NOT NULL,
> flag_id bigint NOT NULL,
< override_id integer NOT NULL,
> override_id bigint NOT NULL,
< flag_id integer NOT NULL,
> flag_id bigint NOT NULL,
< notification_id integer NOT NULL,
> notification_id bigint NOT NULL,
< session_id integer NOT NULL,
> session_id bigint NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) NOT NULL,
< setting_id integer NOT NULL,
> setting_id bigint NOT NULL,
< price_history_id integer NOT NULL,
> price_history_id bigint NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< ticket_id integer NOT NULL,
> ticket_id bigint NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) NOT NULL,
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_0_100 FOR VALUES FROM (0) TO (100);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_0_100 FOR VALUES FROM ('0') TO ('100');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_100_200 FOR VALUES FROM (100) TO (200);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_100_200 FOR VALUES FROM ('100') TO ('200');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_200_300 FOR VALUES FROM (200) TO (300);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_200_300 FOR VALUES FROM ('200') TO ('300');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_300_plus FOR VALUES FROM (300) TO (MAXVALUE);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_300_plus FOR VALUES FROM ('300') TO (MAXVALUE);
EOF
)

# Expected content changes for PostgreSQL 15+ (named NOT NULL constraints)
EXPECTED_PG15=$(cat <<EOF
< document_id integer NOT NULL,
> document_id bigint NOT NULL,
< event_id integer NOT NULL,
> event_id bigint NOT NULL,
< flag_id integer NOT NULL,
> flag_id bigint NOT NULL,
< override_id integer NOT NULL,
> override_id bigint NOT NULL,
< flag_id integer NOT NULL,
> flag_id bigint NOT NULL,
EOF)
< notification_id integer NOT NULL,
> notification_id bigint NOT NULL,
< session_id integer NOT NULL,
> session_id bigint NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
< session_id integer DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
> session_id bigint DEFAULT nextval('core.session_data_session_id_seq'::regclass) CONSTRAINT session_data_session_id_not_null NOT NULL,
< setting_id integer NOT NULL,
> setting_id bigint NOT NULL,
< price_history_id integer NOT NULL,
> price_history_id bigint NOT NULL,
< category_id integer NOT NULL,
> category_id bigint NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
< category_id integer CONSTRAINT price_history_category_id_not_null NOT NULL,
> category_id bigint CONSTRAINT price_history_category_id_not_null NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
< category_id integer CONSTRAINT price_history_category_id_not_null NOT NULL,
> category_id bigint CONSTRAINT price_history_category_id_not_null NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
< category_id integer CONSTRAINT price_history_category_id_not_null NOT NULL,
> category_id bigint CONSTRAINT price_history_category_id_not_null NOT NULL,
< price_history_id integer DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
> price_history_id bigint DEFAULT nextval('inventory.price_history_price_history_id_seq'::regclass) CONSTRAINT price_history_price_history_id_not_null NOT NULL,
< category_id integer CONSTRAINT price_history_category_id_not_null NOT NULL,
> category_id bigint CONSTRAINT price_history_category_id_not_null NOT NULL,
< ticket_id integer NOT NULL,
> ticket_id bigint NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
< ticket_id integer DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
> ticket_id bigint DEFAULT nextval('sales.ticket_queue_ticket_id_seq'::regclass) CONSTRAINT ticket_queue_ticket_id_not_null NOT NULL,
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_0_100 FOR VALUES FROM (0) TO (100);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_0_100 FOR VALUES FROM ('0') TO ('100');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_100_200 FOR VALUES FROM (100) TO (200);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_100_200 FOR VALUES FROM ('100') TO ('200');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_200_300 FOR VALUES FROM (200) TO (300);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_200_300 FOR VALUES FROM ('200') TO ('300');
< ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_300_plus FOR VALUES FROM (300) TO (MAXVALUE);
> ALTER TABLE ONLY inventory.price_history ATTACH PARTITION inventory.price_history_cat_300_plus FOR VALUES FROM ('300') TO (MAXVALUE);
EOF
)

diff source.sql destination.sql > diff.txt || true

# Extract just the content lines (< and >) for comparison
ACTUAL_CHANGES=$(grep '^[<>]' diff.txt)
if [ "$ACTUAL_CHANGES" != "$EXPECTED_CHANGES" ]; then
if [ "$ACTUAL_CHANGES" != "$EXPECTED_PG14" ] && [ "$ACTUAL_CHANGES" != "$EXPECTED_PG15" ]; then
echo "Schema diff does not match expected changes"
echo "=== Expected ==="
echo "$EXPECTED_CHANGES"
echo "=== Expected (PG < 15) ==="
echo "$EXPECTED_PG14"
echo "=== Expected (PG 15+) ==="
echo "$EXPECTED_PG15"
echo "=== Actual ==="
echo "$ACTUAL_CHANGES"
exit 1
Expand Down
Loading
Loading