pg_audit Makefile, REINDEX changes

sfrost · sfrost · commit a936743b336e · 2015-05-17T09:56:57.000-04:00
Clean up the Makefile, per Michael Paquier.

Classify REINDEX as we do in core, use '1.0' for the version, per Fujii.
diff --git a/contrib/pg_audit/Makefile b/contrib/pg_audit/Makefile
@@ -1,13 +1,13 @@
-# pg_audit/Makefile
+# contrib/pg_audit/Makefile
 
-MODULE = pg_audit
 MODULE_big = pg_audit
-OBJS = pg_audit.o
+OBJS = pg_audit.o $(WIN32RES)
 
 EXTENSION = pg_audit
+DATA = pg_audit--1.0.sql
+PGFILEDESC = "pg_audit - An audit logging extension for PostgreSQL"
+
 REGRESS = pg_audit
-REGRESS_OPTS =
-DATA = pg_audit--1.0.0.sql
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/pg_audit/pg_audit--1.0.sql b/contrib/pg_audit/pg_audit--1.0.sql
@@ -1,4 +1,4 @@
-/* pg_audit/pg_audit--1.0.0.sql */
+/* pg_audit/pg_audit--1.0.sql */
 
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pg_audit" to load this file.\quit
diff --git a/contrib/pg_audit/pg_audit.c b/contrib/pg_audit/pg_audit.c
@@ -540,12 +540,6 @@ log_audit_event(AuditEventStackItem *stackItem)
 					class = LOG_READ;
 					break;
 
-				/* Reindex is DDL (because cluster is DDL) */
-				case T_ReindexStmt:
-					className = CLASS_DDL;
-					class = LOG_DDL;
-					break;
-
 				/* FUNCTION statements */
 				case T_DoStmt:
 					className = CLASS_FUNCTION;
diff --git a/contrib/pg_audit/pg_audit.control b/contrib/pg_audit/pg_audit.control
@@ -1,5 +1,5 @@
 # pg_audit extension
 comment = 'provides auditing functionality'
-default_version = '1.0.0'
+default_version = '1.0'
 module_pathname = '$libdir/pg_audit'
 relocatable = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* pg_audit/pg_audit--1.0.0.sql */`
	`1`	`+/* pg_audit/pg_audit--1.0.sql */`
`2`	`2`
`3`	`3`	`-- complain if script is sourced in psql, rather than via CREATE EXTENSION`
`4`	`4`	`\echo Use "CREATE EXTENSION pg_audit" to load this file.\quit`