Skip to content

Commit db7a9c1

Browse files
committed
chore: fix test database/dbmate tool to work with new start-server
1 parent 9303e5c commit db7a9c1

File tree

2 files changed

+23
-35
lines changed

2 files changed

+23
-35
lines changed

migrations/schema-orioledb-17.sql

Lines changed: 22 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ CREATE SCHEMA auth;
2424
CREATE SCHEMA extensions;
2525

2626

27+
--
28+
-- Name: graphql; Type: SCHEMA; Schema: -; Owner: -
29+
--
30+
31+
CREATE SCHEMA graphql;
32+
33+
2734
--
2835
-- Name: graphql_public; Type: SCHEMA; Schema: -; Owner: -
2936
--
@@ -94,6 +101,20 @@ CREATE EXTENSION IF NOT EXISTS orioledb WITH SCHEMA public;
94101
COMMENT ON EXTENSION orioledb IS 'OrioleDB -- the next generation transactional engine';
95102

96103

104+
--
105+
-- Name: pg_graphql; Type: EXTENSION; Schema: -; Owner: -
106+
--
107+
108+
CREATE EXTENSION IF NOT EXISTS pg_graphql WITH SCHEMA graphql;
109+
110+
111+
--
112+
-- Name: EXTENSION pg_graphql; Type: COMMENT; Schema: -; Owner: -
113+
--
114+
115+
COMMENT ON EXTENSION pg_graphql IS 'pg_graphql: GraphQL support';
116+
117+
97118
--
98119
-- Name: pg_stat_statements; Type: EXTENSION; Schema: -; Owner: -
99120
--
@@ -484,39 +505,6 @@ $_$;
484505
COMMENT ON FUNCTION extensions.set_graphql_placeholder() IS 'Reintroduces placeholder function for graphql_public.graphql';
485506

486507

487-
--
488-
-- Name: graphql(text, text, jsonb, jsonb); Type: FUNCTION; Schema: graphql_public; Owner: -
489-
--
490-
491-
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
492-
LANGUAGE plpgsql
493-
AS $$
494-
DECLARE
495-
server_version float;
496-
BEGIN
497-
server_version = (SELECT (SPLIT_PART((select version()), ' ', 2))::float);
498-
499-
IF server_version >= 14 THEN
500-
RETURN jsonb_build_object(
501-
'errors', jsonb_build_array(
502-
jsonb_build_object(
503-
'message', 'pg_graphql extension is not enabled.'
504-
)
505-
)
506-
);
507-
ELSE
508-
RETURN jsonb_build_object(
509-
'errors', jsonb_build_array(
510-
jsonb_build_object(
511-
'message', 'pg_graphql is only available on projects running Postgres 14 onwards.'
512-
)
513-
)
514-
);
515-
END IF;
516-
END;
517-
$$;
518-
519-
520508
--
521509
-- Name: get_auth(text); Type: FUNCTION; Schema: pgbouncer; Owner: -
522510
--
@@ -625,7 +613,7 @@ CREATE FUNCTION vault.secrets_encrypt_secret_secret() RETURNS trigger
625613

626614
SET default_tablespace = '';
627615

628-
SET default_table_access_method = heap;
616+
SET default_table_access_method = orioledb;
629617

630618
--
631619
-- Name: audit_log_entries; Type: TABLE; Schema: auth; Owner: -

nix/tools/dbmate-tool.sh.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ trim_schema() {
156156
}
157157
overmind_start() {
158158
cat > Procfile << EOF
159-
postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" "$PSQL_VERSION"
159+
postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations
160160
EOF
161161
overmind start -D
162162
echo "Waiting for overmind socket..."

0 commit comments

Comments
 (0)