summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Frost2015-05-17 13:56:57 +0000
committerStephen Frost2015-05-17 13:56:57 +0000
commita936743b336ed0b53f1ddb28b4535f4c27bd2b23 (patch)
tree54df908d524530807796f14131c7c2d28e8f24b1
parent3b075e9d7be0181f8434e7b24007d87b618934c0 (diff)
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.
-rw-r--r--contrib/pg_audit/Makefile10
-rw-r--r--contrib/pg_audit/pg_audit--1.0.sql (renamed from contrib/pg_audit/pg_audit--1.0.0.sql)2
-rw-r--r--contrib/pg_audit/pg_audit.c6
-rw-r--r--contrib/pg_audit/pg_audit.control2
4 files changed, 7 insertions, 13 deletions
diff --git a/contrib/pg_audit/Makefile b/contrib/pg_audit/Makefile
index bd6897e534..9ba2e4d361 100644
--- 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
index 9d9ee83f73..457f2c65ba 100644
--- 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 13928cda21..4b75fefc34 100644
--- 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 6730c68916..40c0b0a883 100644
--- 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