* bugs fixed

* Makefile: "make check" fixed
* schema-qualified names arent mandatory anymore

Author: zilder

Makefile

@@ -24,3 +24,4 @@ endif
 
 $(EXTENSION)--$(EXTVERSION).sql: sql/init.sql sql/hash.sql sql/range.sql
 	cat $^ > $@
+check: EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add

conf.add

@@ -0,0 +1 @@
+shared_preload_libraries='pathman'

expected/pathman.out

@@ -333,7 +333,6 @@ NOTICE:  function test.hash_rel_hash_update_trigger_func() does not exist, skipp
 (1 row)
 
 DROP TABLE test.hash_rel CASCADE;
-NOTICE:  drop cascades to 3 other objects
 SELECT pathman.drop_range_partitions('test.num_range_rel');
  drop_range_partitions 
 -----------------------

init.c

@@ -49,7 +49,7 @@ get_extension_schema()
 	bool isnull;
 
 	ret = SPI_exec("SELECT extnamespace::regnamespace::text FROM pg_extension WHERE extname = 'pathman'", 0);
-	if (ret > 0 && SPI_tuptable != NULL)
+	if (ret > 0 && SPI_tuptable != NULL && SPI_processed > 0)
 	{
 		TupleDesc tupdesc = SPI_tuptable->tupdesc;
 		SPITupleTable *tuptable = SPI_tuptable;
@@ -295,7 +295,7 @@ load_check_constraints(Oid parent_oid)
 		{
 			if (ranges[i].max > ranges[i+1].min)
 			{
-				elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u..",
+				elog(WARNING, "Partitions %u and %u overlap. Disabling pathman for relation %u...",
 					 ranges[i].child_oid, ranges[i+1].child_oid, parent_oid);
 				hash_search(relations, (const void *) &parent_oid, HASH_REMOVE, &found);
 			}

pathman.c

@@ -1,6 +1,7 @@
 #include "pathman.h"
 #include "postgres.h"
 #include "fmgr.h"
+#include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/pg_list.h"
 #include "nodes/relation.h"
@@ -100,6 +101,14 @@ static void set_pathkeys(PlannerInfo *root, RelOptInfo *childrel, Path *path);
 void
 _PG_init(void)
 {
+	if (IsUnderPostmaster)
+	{
+		elog(ERROR, "Pathman module must be initialized in postmaster. "
+					"Put the following line to configuration file: "
+					"shared_preload_library = 'pathman'");
+		initialization_needed = false;
+	}
+
 	set_rel_pathlist_hook_original = set_rel_pathlist_hook;
 	set_rel_pathlist_hook = pathman_set_rel_pathlist_hook;
 	shmem_startup_hook_original = shmem_startup_hook;

sql/hash.sql

@@ -108,11 +108,17 @@ DECLARE
     rec RECORD;
     num INTEGER := 0;
 BEGIN
+    relation := @[email protected]_relname(relation);
+
     /* Drop trigger first */
     PERFORM @[email protected]_hash_triggers(relation);
     DELETE FROM @[email protected]_config WHERE relname = relation;
-    -- EXECUTE format('DROP TABLE %s CASCADE', relation);
-    
+
+    FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
+    LOOP
+        EXECUTE format('DROP TABLE %s', rec.inhrelid::regclass::text);
+    END LOOP;
+
     -- FOR rec in (SELECT * FROM pg_inherits WHERE inhparent = relation::regclass::oid)
     -- LOOP
     --     EXECUTE format('DROP FUNCTION IF EXISTS %s_hash_update_trigger_func() CASCADE'

sql/init.sql

@@ -110,26 +110,23 @@ LANGUAGE plpgsql;
 CREATE OR REPLACE FUNCTION @[email protected]_relname(relname TEXT)
 RETURNS TEXT AS
 $$
-DECLARE
-    ret TEXT := lower(relname);
 BEGIN
-    IF NOT ret ~ '^([a-z_]+[a-z0-9_]*)\.([a-z_]+[a-z0-9_]*)$' THEN
-        RAISE EXCEPTION 'Incorrect relation name. It must be fully qualified: <schema>.<relname>';
-    END IF;
-    RETURN ret;
+    RETURN @[email protected]_schema_qualified_name(relname::regclass, '.');
 END
 $$
 LANGUAGE plpgsql;
 
 
 /*
- *
+ * Returns schema-qualified name for table
  */
-CREATE OR REPLACE FUNCTION @[email protected]_schema_qualified_name(cls regclass)
+CREATE OR REPLACE FUNCTION @[email protected]_schema_qualified_name(
+    cls REGCLASS
+    , delimiter TEXT DEFAULT '_')
 RETURNS TEXT AS
 $$
 BEGIN
-    RETURN relnamespace::regnamespace || '_' || relname FROM pg_class WHERE oid = cls::oid;
+    RETURN relnamespace::regnamespace || delimiter || relname FROM pg_class WHERE oid = cls::oid;
 END
 $$
 LANGUAGE plpgsql;

sql/range.sql

@@ -477,7 +477,7 @@ DECLARE
                     EXECUTE format(''INSERT INTO %%s SELECT $1.*'', v_part_relid::regclass)
                     USING NEW;
                 ELSE
-                    RAISE EXCEPTION ''ERROR: Cannot determine approprite partition'';
+                    RAISE EXCEPTION ''ERROR: Cannot find partition'';
                 END IF;
             END IF;
             RETURN NULL;