pathman: makefile changed in order to aggregate sql scripts

zilder · zilder · commit 3ca814cc4d5c · 2016-01-15T16:04:24.000+03:00
diff --git a/contrib/pathman/.gitignore b/contrib/pathman/.gitignore
@@ -0,0 +1,2 @@
+*.o
+*.so
diff --git a/contrib/pathman/Makefile b/contrib/pathman/Makefile
@@ -4,11 +4,15 @@ MODULE_big = pathman
 OBJS = init.o pathman.o $(WIN32RES)
 
 EXTENSION = pathman
+EXTVERSION = 0.1
 DATA = pathman--0.1.sql
 PGFILEDESC = "pathman - partitioning tool"
 
 REGRESS = pathman
 
+$(EXTENSION)--$(EXTVERSION).sql: sql/init.sql sql/hash.sql sql/range.sql
+	cat $^ > $@
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
@@ -18,4 +22,4 @@ subdir = contrib/pathman
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
-endif
+endif
diff --git a/contrib/pathman/sql/hash.sql b/contrib/pathman/sql/hash.sql
@@ -1,10 +1,10 @@
 /*
  * Creates hash partitions for specified relation
  */
-CREATE OR REPLACE FUNCTION public.create_hash_partitions(
-    IN relation TEXT
-    , IN attribute TEXT
-    , IN partitions_count INTEGER
+CREATE OR REPLACE FUNCTION create_hash_partitions(
+    relation TEXT
+    , attribute TEXT
+    , partitions_count INTEGER
 ) RETURNS VOID AS
 $$
 DECLARE
@@ -24,12 +24,12 @@ BEGIN
     /* Create partitions and update pg_pathman configuration */
     FOR partnum IN 0..partitions_count-1
     LOOP
-        EXECUTE format('CREATE TABLE %s_%s (LIKE %1$s INCLUDING ALL)',
-                        relation
+        EXECUTE format('CREATE TABLE %s_%s (LIKE %1$s INCLUDING ALL)'
+                        , relation
                         , partnum);
 
         EXECUTE format('ALTER TABLE %s_%s INHERIT %1$s'
-                        relation
+                        , relation
                         , partnum);
 
         -- EXECUTE format('CREATE TABLE %s_%s () INHERITS (%1$s)', relation, partnum);
@@ -52,7 +52,7 @@ $$ LANGUAGE plpgsql;
 /*
  * Creates hash trigger for specified relation
  */
-CREATE OR REPLACE FUNCTION public.create_hash_insert_trigger(
+CREATE OR REPLACE FUNCTION create_hash_insert_trigger(
     IN relation TEXT
     , IN attr TEXT
     , IN partitions_count INTEGER)
@@ -105,7 +105,7 @@ $$ LANGUAGE plpgsql;
 /*
  * Drops all partitions for specified relation
  */
-CREATE OR REPLACE FUNCTION public.drop_hash_partitions(IN relation TEXT)
+CREATE OR REPLACE FUNCTION drop_hash_partitions(IN relation TEXT)
 RETURNS VOID AS
 $$
 DECLARE
@@ -135,7 +135,7 @@ $$ LANGUAGE plpgsql;
 /*
  * Drops hash trigger
  */
-CREATE OR REPLACE FUNCTION public.drop_hash_triggers(IN relation TEXT)
+CREATE OR REPLACE FUNCTION drop_hash_triggers(IN relation TEXT)
 RETURNS VOID AS
 $$
 BEGIN
@@ -146,7 +146,7 @@ BEGIN
 END
 $$ LANGUAGE plpgsql;
 
-CREATE OR REPLACE FUNCTION public.create_hash_update_trigger(
+CREATE OR REPLACE FUNCTION create_hash_update_trigger(
     IN relation TEXT
     , IN attr TEXT
     , IN partitions_count INTEGER)
diff --git a/contrib/pathman/sql/init.sql b/contrib/pathman/sql/init.sql
diff --git a/contrib/pathman/sql/range.sql b/contrib/pathman/sql/range.sql
@@ -63,7 +63,7 @@ BEGIN
     SELECT relfilenode INTO v_relid
     FROM pg_class WHERE relname = v_relation;
 
-    SELECT max('max_dt') INTO v_part_timestamp FROM pg_pathman_range_rels;
+    SELECT max(max_dt) INTO v_part_timestamp FROM pg_pathman_range_rels;
 
     /* Create partitions and update pg_pathman configuration */
     FOR v_partnum IN 0..v_premake-1
