Skip to content

Commit 944f213

Browse files
max-norinmax-norin
committed
fix table name
1 parent d3c0eb5 commit 944f213

5 files changed

+14
-14
lines changed

‎dist/pg_full_inherit--1.0.sql

+7-7
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ BEGIN
166166
EXIT WHEN "constraint" IS NULL;
167167

168168
"name" = @[email protected]_child_constraint_name("constraint"."parentname", "constraint"."parentrelid"::REGCLASS::TEXT, "constraint"."childrelid"::REGCLASS::TEXT);
169-
"query" = format('ALTER TABLE %1I ADD CONSTRAINT %2I %3s;', "constraint"."childrelid"::REGCLASS, "name", "constraint"."parentdef");
170-
RAISE NOTICE USING MESSAGE = format('-- ADD CONSTRAINT %1I TO %2I TABLE FROM %3I TABLE', "name", "constraint"."childrelid"::REGCLASS, "constraint"."parentrelid"::REGCLASS);
169+
"query" = format('ALTER TABLE %1s ADD CONSTRAINT %2I %3s;', "constraint"."childrelid"::REGCLASS, "name", "constraint"."parentdef");
170+
RAISE NOTICE USING MESSAGE = format('-- ADD CONSTRAINT %1I TO %2s TABLE FROM %3s TABLE', "name", "constraint"."childrelid"::REGCLASS, "constraint"."parentrelid"::REGCLASS);
171171
RAISE NOTICE USING MESSAGE = "query";
172172
EXECUTE "query";
173173
END LOOP;
@@ -224,7 +224,7 @@ BEGIN
224224

225225
"name" = @[email protected]_child_trigger_name("trigger"."parentname", "trigger"."parentrelid"::REGCLASS::TEXT, "trigger"."childrelid"::REGCLASS::TEXT);
226226
"query" = @[email protected]_child_trigger_def("trigger"."parentdef", "trigger"."parentname", "trigger"."parentrelid"::REGCLASS::TEXT, "trigger"."childrelid"::REGCLASS::TEXT);
227-
RAISE NOTICE USING MESSAGE = format('-- ADD TRIGGER %1I TO %2I TABLE FROM %3I TABLE', "name", "trigger"."childrelid"::REGCLASS, "trigger"."parentrelid"::REGCLASS);
227+
RAISE NOTICE USING MESSAGE = format('-- ADD TRIGGER %1I TO %2s TABLE FROM %3s TABLE', "name", "trigger"."childrelid"::REGCLASS, "trigger"."parentrelid"::REGCLASS);
228228
RAISE NOTICE USING MESSAGE = "query";
229229
EXECUTE "query";
230230
END LOOP;
@@ -261,8 +261,8 @@ BEGIN
261261
SELECT inhrelid FROM pg_inherits WHERE inhparent = "parent"
262262
LOOP
263263
"name" = @[email protected]_child_constraint_name("name", "parent"::REGCLASS::TEXT, "child"::REGCLASS::TEXT);
264-
"query" = format('ALTER TABLE %1I DROP CONSTRAINT IF EXISTS %2I;', "child"::REGCLASS, "name");
265-
RAISE NOTICE USING MESSAGE = format('-- DROP CONSTRAINT %1I FROM %2I TABLE BASED ON DEPENDENCY ON %3I TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
264+
"query" = format('ALTER TABLE %1s DROP CONSTRAINT IF EXISTS %2I;', "child"::REGCLASS, "name");
265+
RAISE NOTICE USING MESSAGE = format('-- DROP CONSTRAINT %1I FROM %2s TABLE BASED ON DEPENDENCY ON %3s TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
266266
RAISE NOTICE USING MESSAGE = "query";
267267
EXECUTE "query";
268268
END LOOP;
@@ -299,8 +299,8 @@ BEGIN
299299
SELECT inhrelid FROM pg_inherits WHERE inhparent = "parent"
300300
LOOP
301301
"name" = @[email protected]_child_trigger_name("name", "parent"::REGCLASS::TEXT, "child"::REGCLASS::TEXT);
302-
"query" = format('DROP TRIGGER IF EXISTS %1I ON %2I;', "name", "child"::REGCLASS);
303-
RAISE NOTICE USING MESSAGE = format('-- DROP TRIGGER %1I FROM %2I TABLE BASED ON DEPENDENCY ON %3I TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
302+
"query" = format('DROP TRIGGER IF EXISTS %1I ON %2s;', "name", "child"::REGCLASS);
303+
RAISE NOTICE USING MESSAGE = format('-- DROP TRIGGER %1I FROM %2s TABLE BASED ON DEPENDENCY ON %3s TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
304304
RAISE NOTICE USING MESSAGE = "query";
305305
EXECUTE "query";
306306
END LOOP;

‎event-triggers/add_inherit_constraints.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ BEGIN
6666
-- имя для ограничения дочерней таблицы
6767
"name" = public.get_child_constraint_name("constraint"."parentname", "constraint"."parentrelid"::REGCLASS::TEXT, "constraint"."childrelid"::REGCLASS::TEXT);
6868
-- запрос на добавление ограничения name в таблицу childrelid
69-
"query" = format('ALTER TABLE %1I ADD CONSTRAINT %2I %3s;', "constraint"."childrelid"::REGCLASS, "name", "constraint"."parentdef");
70-
RAISE NOTICE USING MESSAGE = format('-- ADD CONSTRAINT %1I TO %2I TABLE FROM %3I TABLE', "name", "constraint"."childrelid"::REGCLASS, "constraint"."parentrelid"::REGCLASS);
69+
"query" = format('ALTER TABLE %1s ADD CONSTRAINT %2I %3s;', "constraint"."childrelid", "name", "constraint"."parentdef");
70+
RAISE NOTICE USING MESSAGE = format('-- ADD CONSTRAINT %1I TO %2s TABLE FROM %3s TABLE', "name", "constraint"."childrelid", "constraint"."parentrelid");
7171
-- запрос query запустить рекурсию этого метода,
7272
-- так как содержит команду ALTER TABLE,
7373
-- которая обрабатывается этой же функцией

‎event-triggers/add_inherit_triggers.sql

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ BEGIN
6060
"name" = public.get_child_trigger_name("trigger"."parentname", "trigger"."parentrelid"::REGCLASS::TEXT, "trigger"."childrelid"::REGCLASS::TEXT);
6161
-- запрос на добавление триггера в таблицу childrelid
6262
"query" = public.get_child_trigger_def("trigger"."parentdef", "trigger"."parentname", "trigger"."parentrelid"::REGCLASS::TEXT, "trigger"."childrelid"::REGCLASS::TEXT);
63-
RAISE NOTICE USING MESSAGE = format('-- ADD TRIGGER %1I TO %2I TABLE FROM %3I TABLE', "name", "trigger"."childrelid"::REGCLASS, "trigger"."parentrelid"::REGCLASS);
63+
RAISE NOTICE USING MESSAGE = format('-- ADD TRIGGER %1I TO %2s TABLE FROM %3s TABLE', "name", "trigger"."childrelid"::REGCLASS, "trigger"."parentrelid"::REGCLASS);
6464
RAISE NOTICE USING MESSAGE = "query";
6565
EXECUTE "query";
6666
END LOOP;

‎event-triggers/drop_inherit_constraints.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ BEGIN
3535
-- имя ограничения дочерней таблице
3636
"name" = public.get_child_constraint_name("name", "parent"::REGCLASS::TEXT, "child"::REGCLASS::TEXT);
3737
-- удаление ограничения name из дочерней таблицы
38-
"query" = format('ALTER TABLE %1I DROP CONSTRAINT IF EXISTS %2I;', "child"::REGCLASS, "name");
39-
RAISE NOTICE USING MESSAGE = format('-- DROP CONSTRAINT %1I FROM %2I TABLE BASED ON DEPENDENCY ON %3I TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
38+
"query" = format('ALTER TABLE %1s DROP CONSTRAINT IF EXISTS %2I;', "child"::REGCLASS, "name");
39+
RAISE NOTICE USING MESSAGE = format('-- DROP CONSTRAINT %1I FROM %2s TABLE BASED ON DEPENDENCY ON %3s TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
4040
RAISE NOTICE USING MESSAGE = "query";
4141
EXECUTE "query";
4242
END LOOP;

‎event-triggers/drop_inherit_triggers.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ BEGIN
3535
-- имя триггера дочерней таблице
3636
"name" = public.get_child_trigger_name("name", "parent"::REGCLASS::TEXT, "child"::REGCLASS::TEXT);
3737
-- удаление триггер name из дочерней таблицы
38-
"query" = format('DROP TRIGGER IF EXISTS %1I ON %2I;', "name", "child"::REGCLASS);
39-
RAISE NOTICE USING MESSAGE = format('-- DROP TRIGGER %1I FROM %2I TABLE BASED ON DEPENDENCY ON %3I TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
38+
"query" = format('DROP TRIGGER IF EXISTS %1I ON %2s;', "name", "child"::REGCLASS);
39+
RAISE NOTICE USING MESSAGE = format('-- DROP TRIGGER %1I FROM %2s TABLE BASED ON DEPENDENCY ON %3s TABLE', "name", "child"::REGCLASS, "parent"::REGCLASS);
4040
RAISE NOTICE USING MESSAGE = "query";
4141
EXECUTE "query";
4242
END LOOP;

0 commit comments

Comments
 (0)