Skip to content

Commit f0b9480

Browse files
committed
feat: update orioledb to beta16
1 parent 6dfd0e6 commit f0b9480

11 files changed

Lines changed: 54 additions & 39 deletions

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: "17.6.0.100-orioledb"
14-
postgres17: "17.6.1.143"
15-
postgres15: "15.14.1.143"
13+
postgresorioledb-17: "17.9.0.001-orioledb-test-11"
14+
postgres17: "17.6.1.144-test-11"
15+
postgres15: "15.14.1.144-test-11"
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.25.1

migrations/schema-orioledb-17.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
\restrict SupabaseTestDumpKey123
66

7-
-- Dumped from database version 17.6
8-
-- Dumped by pg_dump version 17.6
7+
-- Dumped from database version 17.9
8+
-- Dumped by pg_dump version 17.9
99

1010
SET statement_timeout = 0;
1111
SET lock_timeout = 0;

nix/config.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ in
5656
};
5757
orioledb = {
5858
"17" = {
59-
version = "17_16";
60-
hash = "sha256-Xm9IUsvmlcayNQH8TCvHoIV23xkt/WQV0Oy4CiJkywc=";
59+
version = "17_20";
60+
hash = "sha256-HDrHTx9yeIPJoyIBs+BdAhBQqt1IEtQrG9pFfvHJqdg=";
6161
};
6262
};
6363
};

nix/ext/orioledb.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
1515
src = fetchFromGitHub {
1616
owner = "orioledb";
1717
repo = "orioledb";
18-
rev = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02";
19-
sha256 = "sha256-Vz3vfmTGRW+O9aXZxqixHC2CpqZJf/1UCQWoENbAak4=";
18+
rev = "beta16";
19+
sha256 = "sha256-HCfNzMPt80nGeVwlstUCeMpdNZYd9KhLLHYyD/Hvuhk=";
2020
};
21-
version = "982e11ae62c9e00c0d74f9f8de31d99ff383fd02";
21+
version = "beta16";
2222
buildInputs = [
2323
curl
2424
libkrb5
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727
openssl
2828
];
2929
buildPhase = ''
30-
make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=16
30+
make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=20
3131
'';
3232
installPhase = ''
3333
runHook preInstall

nix/ext/pg_cron/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ let
6363
mv $out/share/postgresql/extension/pg_cron--1.5--1.6.sql $out/share/postgresql/extension/pg_cron--1.5.2--1.6.4.sql
6464
fi
6565
66+
find $out/share/postgresql/extension -name "*.sql" \
67+
-exec sed -Ei '/^CREATE TABLE\b/,/^\);$/ s/^\);$/) USING heap;/' {} +
68+
6669
# Create versioned control file with modified module path
6770
sed -e "/^default_version =/d" \
6871
-e "/^schema =/d" \

nix/tests/expected/z_multigres-orioledb-17_docs-cascades-deletes.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,25 @@ insert into grandparent
7676
values
7777
(1, 'Elizabeth');
7878
ERROR: duplicate key value violates unique constraint "grandparent_pkey"
79-
DETAIL: Key (id)=('1') already exists.
79+
DETAIL: Key (id)=(1) already exists.
8080
insert into parent
8181
(id, name, parent_id)
8282
values
8383
(1, 'Charles', 1);
8484
ERROR: duplicate key value violates unique constraint "parent_pkey"
85-
DETAIL: Key (id)=('1') already exists.
85+
DETAIL: Key (id)=(1) already exists.
8686
insert into parent
8787
(id, name, parent_id)
8888
values
8989
(2, 'Diana', 1);
9090
ERROR: duplicate key value violates unique constraint "parent_pkey"
91-
DETAIL: Key (id)=('2') already exists.
91+
DETAIL: Key (id)=(2) already exists.
9292
insert into child
9393
(id, name, father)
9494
values
9595
(1, 'William', 1);
9696
ERROR: duplicate key value violates unique constraint "child_pkey"
97-
DETAIL: Key (id)=('1') already exists.
97+
DETAIL: Key (id)=(1) already exists.
9898
alter table child
9999
drop constraint child_father_fkey;
100100
alter table child
@@ -126,25 +126,25 @@ insert into grandparent
126126
values
127127
(1, 'Elizabeth');
128128
ERROR: duplicate key value violates unique constraint "grandparent_pkey"
129-
DETAIL: Key (id)=('1') already exists.
129+
DETAIL: Key (id)=(1) already exists.
130130
insert into parent
131131
(id, name, parent_id)
132132
values
133133
(1, 'Charles', 1);
134134
ERROR: duplicate key value violates unique constraint "parent_pkey"
135-
DETAIL: Key (id)=('1') already exists.
135+
DETAIL: Key (id)=(1) already exists.
136136
insert into parent
137137
(id, name, parent_id)
138138
values
139139
(2, 'Diana', 1);
140140
ERROR: duplicate key value violates unique constraint "parent_pkey"
141-
DETAIL: Key (id)=('2') already exists.
141+
DETAIL: Key (id)=(2) already exists.
142142
insert into child
143143
(id, name, father)
144144
values
145145
(1, 'William', 1);
146146
ERROR: duplicate key value violates unique constraint "child_pkey"
147-
DETAIL: Key (id)=('1') already exists.
147+
DETAIL: Key (id)=(1) already exists.
148148
alter table child
149149
drop constraint child_father_fkey;
150150
alter table child
@@ -176,25 +176,25 @@ insert into grandparent
176176
values
177177
(1, 'Elizabeth');
178178
ERROR: duplicate key value violates unique constraint "grandparent_pkey"
179-
DETAIL: Key (id)=('1') already exists.
179+
DETAIL: Key (id)=(1) already exists.
180180
insert into parent
181181
(id, name, parent_id)
182182
values
183183
(1, 'Charles', 1);
184184
ERROR: duplicate key value violates unique constraint "parent_pkey"
185-
DETAIL: Key (id)=('1') already exists.
185+
DETAIL: Key (id)=(1) already exists.
186186
insert into parent
187187
(id, name, parent_id)
188188
values
189189
(2, 'Diana', 1);
190190
ERROR: duplicate key value violates unique constraint "parent_pkey"
191-
DETAIL: Key (id)=('2') already exists.
191+
DETAIL: Key (id)=(2) already exists.
192192
insert into child
193193
(id, name, father)
194194
values
195195
(1, 'William', 1);
196196
ERROR: duplicate key value violates unique constraint "child_pkey"
197-
DETAIL: Key (id)=('1') already exists.
197+
DETAIL: Key (id)=(1) already exists.
198198
alter table child
199199
add column mother integer references parent (id)
200200
on delete cascade;

nix/tests/expected/z_multigres-orioledb-17_docs-functions.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ end;
6363
$$;
6464
select * from add_planet('Jakku');
6565
ERROR: duplicate key value violates unique constraint "planets_pkey"
66-
DETAIL: Key (id)=('1') already exists.
66+
DETAIL: Key (id)=(1) already exists.
6767
CONTEXT: SQL statement "insert into planets(name)
6868
values (add_planet.name)
6969
returning id"

0 commit comments

Comments
 (0)