feat: update oriole extension to beta9 (#1407)

* feat: update oriole extension to beta9 * chore: testing suffix * chore: rm staging suffix * chore: update pg_regres for changes in oriole sql ext interface * chore: fix test database/dbmate tool to work with new start-server (#1410)
supabase · Jan 15, 2025 · 608d579 · 608d579
1 parent f9bb095
commit 608d579
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 48 deletions.
diff --git a/ansible/vars.yml b/ansible/vars.yml
@@ -8,8 +8,8 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.0.1.018-orioledb"
-  postgres15: "15.8.1.028"
+  postgresorioledb-17: "17.0.1.019-orioledb"
+  postgres15: "15.8.1.029"
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"

diff --git a/migrations/schema-orioledb-17.sql b/migrations/schema-orioledb-17.sql
@@ -24,6 +24,13 @@ CREATE SCHEMA auth;
 CREATE SCHEMA extensions;
 
 
+--
+-- Name: graphql; Type: SCHEMA; Schema: -; Owner: -
+--
+
+CREATE SCHEMA graphql;
+
+
 --
 -- Name: graphql_public; Type: SCHEMA; Schema: -; Owner: -
 --
@@ -94,6 +101,20 @@ CREATE EXTENSION IF NOT EXISTS orioledb WITH SCHEMA public;
 COMMENT ON EXTENSION orioledb IS 'OrioleDB -- the next generation transactional engine';
 
 
+--
+-- Name: pg_graphql; Type: EXTENSION; Schema: -; Owner: -
+--
+
+CREATE EXTENSION IF NOT EXISTS pg_graphql WITH SCHEMA graphql;
+
+
+--
+-- Name: EXTENSION pg_graphql; Type: COMMENT; Schema: -; Owner: -
+--
+
+COMMENT ON EXTENSION pg_graphql IS 'pg_graphql: GraphQL support';
+
+
 --
 -- Name: pg_stat_statements; Type: EXTENSION; Schema: -; Owner: -
 --
@@ -484,39 +505,6 @@ $_$;
 COMMENT ON FUNCTION extensions.set_graphql_placeholder() IS 'Reintroduces placeholder function for graphql_public.graphql';
 
 
---
--- Name: graphql(text, text, jsonb, jsonb); Type: FUNCTION; Schema: graphql_public; Owner: -
---
-
-CREATE FUNCTION graphql_public.graphql("operationName" text DEFAULT NULL::text, query text DEFAULT NULL::text, variables jsonb DEFAULT NULL::jsonb, extensions jsonb DEFAULT NULL::jsonb) RETURNS jsonb
-    LANGUAGE plpgsql
-    AS $$
-    DECLARE
-        server_version float;
-    BEGIN
-        server_version = (SELECT (SPLIT_PART((select version()), ' ', 2))::float);
-
-        IF server_version >= 14 THEN
-            RETURN jsonb_build_object(
-                'errors', jsonb_build_array(
-                    jsonb_build_object(
-                        'message', 'pg_graphql extension is not enabled.'
-                    )
-                )
-            );
-        ELSE
-            RETURN jsonb_build_object(
-                'errors', jsonb_build_array(
-                    jsonb_build_object(
-                        'message', 'pg_graphql is only available on projects running Postgres 14 onwards.'
-                    )
-                )
-            );
-        END IF;
-    END;
-$$;
-
-
 --
 -- Name: get_auth(text); Type: FUNCTION; Schema: pgbouncer; Owner: -
 --
@@ -625,7 +613,7 @@ CREATE FUNCTION vault.secrets_encrypt_secret_secret() RETURNS trigger
 
 SET default_tablespace = '';
 
-SET default_table_access_method = heap;
+SET default_table_access_method = orioledb;
 
 --
 -- Name: audit_log_entries; Type: TABLE; Schema: auth; Owner: -

diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix
@@ -6,19 +6,25 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "orioledb";
     repo = "orioledb";
-    rev = "beta8";
-    sha256 = "sha256-niyTQr1FQYEsKdxl/uVrKSiIR0DCnnT+DDkW47lsc80=";
+    rev = "beta9";
+    sha256 = "sha256-z2EHWsY+hhtnYzAxOl2PWjqfyJ+wp9SCau5LKPT2ec0=";
   };
-  version = "beta8";
+  version = "beta9";
   buildInputs = [ curl libkrb5 postgresql python3 openssl ];
   buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=5";
   installPhase = ''
     runHook preInstall
+    
     mkdir -p $out/{lib,share/postgresql/extension}
 
-    cp *${postgresql.dlSuffix}      $out/lib
-    cp *.sql     $out/share/postgresql/extension
-    cp *.control $out/share/postgresql/extension
+    # Copy the extension library
+    cp orioledb${postgresql.dlSuffix} $out/lib/
+    
+    # Copy sql files from the sql directory
+    cp sql/*.sql $out/share/postgresql/extension/
+    
+    # Copy control file
+    cp orioledb.control $out/share/postgresql/extension/
         
     runHook postInstall
   '';