Skip to content

Commit b819cae

Browse files
committed
Change naming for structure file
1 parent 924b550 commit b819cae

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

db/structure-12.sql db/structure-10.sql

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ $$;
3737

3838
SET default_tablespace = '';
3939

40-
SET default_table_access_method = heap;
41-
4240
--
4341
-- Name: que_jobs; Type: TABLE; Schema: public; Owner: -
4442
--
@@ -1293,14 +1291,14 @@ CREATE INDEX table_channel_id_index ON public.message_bus USING btree (channel,
12931291
-- Name: que_jobs que_job_notify; Type: TRIGGER; Schema: public; Owner: -
12941292
--
12951293

1296-
CREATE TRIGGER que_job_notify AFTER INSERT ON public.que_jobs FOR EACH ROW EXECUTE FUNCTION public.que_job_notify();
1294+
CREATE TRIGGER que_job_notify AFTER INSERT ON public.que_jobs FOR EACH ROW EXECUTE PROCEDURE public.que_job_notify();
12971295

12981296

12991297
--
13001298
-- Name: que_jobs que_state_notify; Type: TRIGGER; Schema: public; Owner: -
13011299
--
13021300

1303-
CREATE TRIGGER que_state_notify AFTER INSERT OR DELETE OR UPDATE ON public.que_jobs FOR EACH ROW EXECUTE FUNCTION public.que_state_notify();
1301+
CREATE TRIGGER que_state_notify AFTER INSERT OR DELETE OR UPDATE ON public.que_jobs FOR EACH ROW EXECUTE PROCEDURE public.que_state_notify();
13041302

13051303

13061304
--

db/structure.sql

+9-3
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ $$;
3737

3838
SET default_tablespace = '';
3939

40+
SET default_table_access_method = heap;
41+
4042
--
4143
-- Name: que_jobs; Type: TABLE; Schema: public; Owner: -
4244
--
@@ -121,7 +123,9 @@ CREATE FUNCTION public.que_job_notify() RETURNS trigger
121123
FROM (
122124
SELECT *
123125
FROM public.que_lockers ql, generate_series(1, ql.worker_count) AS id
124-
WHERE listening AND queues @> ARRAY[NEW.queue]
126+
WHERE
127+
listening AND
128+
queues @> ARRAY[NEW.queue]
125129
ORDER BY md5(pid::text || id::text)
126130
) t1
127131
) t2
@@ -1291,14 +1295,14 @@ CREATE INDEX table_channel_id_index ON public.message_bus USING btree (channel,
12911295
-- Name: que_jobs que_job_notify; Type: TRIGGER; Schema: public; Owner: -
12921296
--
12931297

1294-
CREATE TRIGGER que_job_notify AFTER INSERT ON public.que_jobs FOR EACH ROW EXECUTE PROCEDURE public.que_job_notify();
1298+
CREATE TRIGGER que_job_notify AFTER INSERT ON public.que_jobs FOR EACH ROW EXECUTE FUNCTION public.que_job_notify();
12951299

12961300

12971301
--
12981302
-- Name: que_jobs que_state_notify; Type: TRIGGER; Schema: public; Owner: -
12991303
--
13001304

1301-
CREATE TRIGGER que_state_notify AFTER INSERT OR DELETE OR UPDATE ON public.que_jobs FOR EACH ROW EXECUTE PROCEDURE public.que_state_notify();
1305+
CREATE TRIGGER que_state_notify AFTER INSERT OR DELETE OR UPDATE ON public.que_jobs FOR EACH ROW EXECUTE FUNCTION public.que_state_notify();
13021306

13031307

13041308
--
@@ -1511,3 +1515,5 @@ INSERT INTO "schema_migrations" (version) VALUES
15111515
('20190603140450'),
15121516
('20190605094424'),
15131517
('20210504152609');
1518+
1519+

lib/tasks/db.rake

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ ActiveRecord::Tasks::PostgreSQLDatabaseTasks.prepend(Module.new do
2828
clear_active_connections!
2929
establish_master_connection
3030
server_version = connection.select_value("SHOW server_version").to_i
31-
suffix = server_version < 11 ? '' : '-12'
31+
raise "PostgreSQL #{server_version} is not supported" if server_version < 10 || server_version == 11
32+
suffix = server_version == 10 ? '-10' : ''
3233
ENV['SCHEMA'] ||= "db/structure#{suffix}.sql"
3334
clear_active_connections!
3435
end

0 commit comments

Comments
 (0)