Various cleanups

leto · Jan 17, 2010 · 4e54cdb · 4e54cdb · leto · Jan 19, 2010
1 parent 103f362
commit 4e54cdb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ all:
 	cd src/handler; make
 
 test: all
-	psql test <t/test.sql
+	psql test -f t/test.sql
 
 clean:
 	cd src/handler; make clean

diff --git a/t/test.sql b/t/test.sql
@@ -17,8 +17,21 @@ SELECT plan(2);
 
 --DROP FUNCTION plparrot_call_handler() CASCADE;
 -- TODO: Make this configurable
-CREATE FUNCTION plparrot_call_handler() RETURNS LANGUAGE_HANDLER AS '/Users/leto/git/postgresql/contrib/plparrot/libplparrot.so' LANGUAGE C;
-CREATE LANGUAGE plparrot HANDLER plparrot_call_handler;
+INSERT INTO pg_catalog.pg_pltemplate(
+    tmplname,
+    tmpltrusted,
+    tmpldbacreate,
+    tmplhandler,
+    tmpllibrary
+)
+VALUES (
+    'plparrot',
+    true,
+    true,
+    'plparrot_call_handler',
+    '$libdir/plparrot'
+);
+CREATE LANGUAGE plparrot;
 
 -- These functions should be written in PIR