pg_audit Makefile, REINDEX changes

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
index bd6897e5343abba3bdeb49a5cfc4db9d6d1da5d4..9ba2e4d361f76d00f37236a92969305755a7bb3b 100644 (file)
--- 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.0.sql b/contrib/pg_audit/pg_audit--1.0.sql
similarity index 94%
rename from contrib/pg_audit/pg_audit--1.0.0.sql
rename to contrib/pg_audit/pg_audit--1.0.sql
index 9d9ee83f73bb16a060a313c549976378eccc0970..457f2c65bab0efb2f11709d7481fec4c0ebe7a7e 100644 (file)
--- a/contrib/pg_audit/pg_audit--1.0.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
index 13928cda21a126b6c67c4e0f27eb068cfd8339f2..4b75fefc34ae65bba9d44b9b4b1399ff69bd6043 100644 (file)
--- 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
index 6730c689167d59e1ac02f40e9067db7452161820..40c0b0a883e0e9462977b02c9a10710e7cf35e03 100644 (file)
--- 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