support for ENABLE TRIGGER renamed to enable_trigger from alter_table

dvarrazzo · dvarrazzo · commit 6f8a8bab6d14 · 2012-11-12T11:51:20.000Z
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -61,7 +61,7 @@ typedef struct repack_table
 	const char	   *create_pktype;	/* CREATE TYPE pk */
 	const char	   *create_log;		/* CREATE TABLE log */
 	const char	   *create_trigger;	/* CREATE TRIGGER z_repack_trigger */
-	const char	   *alter_table;	/* ALTER TABLE ENABLE ALWAYS TRIGGER z_repack_trigger */
+	const char	   *enable_trigger;	/* ALTER TABLE ENABLE ALWAYS TRIGGER z_repack_trigger */
 	const char	   *create_table;	/* CREATE TABLE table AS SELECT */
 	const char	   *drop_columns;	/* ALTER TABLE DROP COLUMNs */
 	const char	   *delete_log;		/* DELETE FROM log */
@@ -302,7 +302,7 @@ repack_one_database(const char *orderby, const char *table)
 		table.create_pktype = getstr(res, i, c++);
 		table.create_log = getstr(res, i, c++);
 		table.create_trigger = getstr(res, i, c++);
-		table.alter_table = getstr(res, i, c++);
+		table.enable_trigger = getstr(res, i, c++);
 
 		create_table = getstr(res, i, c++);
 		table.drop_columns = getstr(res, i, c++);
@@ -399,7 +399,7 @@ repack_one_table(const repack_table *table, const char *orderby)
 	elog(DEBUG2, "create_pktype  : %s", table->create_pktype);
 	elog(DEBUG2, "create_log     : %s", table->create_log);
 	elog(DEBUG2, "create_trigger : %s", table->create_trigger);
-	elog(DEBUG2, "alter_table    : %s", table->alter_table);
+	elog(DEBUG2, "enable_trigger : %s", table->enable_trigger);
 	elog(DEBUG2, "create_table   : %s", table->create_table);
 	elog(DEBUG2, "drop_columns   : %s", table->drop_columns ? table->drop_columns : "(skipped)");
 	elog(DEBUG2, "delete_log     : %s", table->delete_log);
@@ -433,7 +433,7 @@ repack_one_table(const repack_table *table, const char *orderby)
 	command(table->create_pktype, 0, NULL);
 	command(table->create_log, 0, NULL);
 	command(table->create_trigger, 0, NULL);
-	command(table->alter_table, 0, NULL);
+	command(table->enable_trigger, 0, NULL);
 	printfStringInfo(&sql, "SELECT repack.disable_autovacuum('repack.log_%u')", table->target_oid);
 	command(sql.data, 0, NULL);
 	command("COMMIT", 0, NULL);
diff --git a/lib/pg_repack.sql.in b/lib/pg_repack.sql.in
@@ -72,11 +72,11 @@ $$
 $$
 LANGUAGE sql STABLE STRICT;
 
-CREATE FUNCTION repack.get_alter_table(relid oid)
+CREATE FUNCTION repack.get_enable_trigger(relid oid)
   RETURNS text AS
 $$
   SELECT 'ALTER TABLE ' || repack.oid2text($1) ||
-    ' ENABLE ALWAYS TRIGGER z_repack_trigger';     
+    ' ENABLE ALWAYS TRIGGER z_repack_trigger';
 $$
 LANGUAGE sql STABLE STRICT;
 
@@ -171,9 +171,9 @@ CREATE VIEW repack.tables AS
          repack.get_create_index_type(PK.indexrelid, 'repack.pk_' || R.oid) AS create_pktype,
          'CREATE TABLE repack.log_' || R.oid || ' (id bigserial PRIMARY KEY, pk repack.pk_' || R.oid || ', row ' || repack.oid2text(R.oid) || ')' AS create_log,
          repack.get_create_trigger(R.oid, PK.indexrelid) AS create_trigger,
-	 repack.get_alter_table(R.oid) as alter_table,
+         repack.get_enable_trigger(R.oid) as enable_trigger,
          'CREATE TABLE repack.table_' || R.oid || ' WITH (' || array_to_string(array_append(R.reloptions, 'oids=' || CASE WHEN R.relhasoids THEN 'true' ELSE 'false' END), ',') || ') TABLESPACE ' || coalesce(quote_ident(S.spcname), 'pg_default') || ' AS SELECT ' || repack.get_columns_for_create_as(R.oid) || ' FROM ONLY ' || repack.oid2text(R.oid) AS create_table,
-		 repack.get_drop_columns(R.oid, 'repack.table_' || R.oid) AS drop_columns,
+         repack.get_drop_columns(R.oid, 'repack.table_' || R.oid) AS drop_columns,
          'DELETE FROM repack.log_' || R.oid AS delete_log,
          'LOCK TABLE ' || repack.oid2text(R.oid) || ' IN ACCESS EXCLUSIVE MODE' AS lock_table,
          repack.get_index_keys(CK.indexrelid, R.oid) AS ckey,
