Use 8.4 in plr.control (#61)

* Use 8.4 in plr.control

* Remove unused testing files

Those were to be used with PG < 9.x

Makefile

@@ -22,7 +22,6 @@ PG_CPPFLAGS	+= $(r_includespec)
 SRCS		+= plr.c pg_conversion.c pg_backend_support.c pg_userfuncs.c pg_rsupport.c
 OBJS		:= $(SRCS:.c=.o)
 SHLIB_LINK	+= -L$(r_libdir1x) -L$(r_libdir2x) -lR
-DATA_built	= plr.sql
 DATA		= plr--8.4.sql plr--8.3.0.18--8.4.sql plr--unpackaged--8.4.sql
 REGRESS		= plr bad_fun opt_window do out_args
 

expected/plr.out

@@ -1,8 +1,5 @@
---
--- first, define the language and functions.  Turn off echoing so that expected file
--- does not depend on contents of plr.sql.
---
-\set ECHO none
+-- install extension
+create extension plr;
 -- make sure we get the notices
 set client_min_messages to notice;
 -- check version

plr--8.4.sql

@@ -1,5 +1,3 @@
--- keep this in sync with the plr.sql.in legacy install file
-
 CREATE FUNCTION plr_call_handler()
 RETURNS LANGUAGE_HANDLER
 AS 'MODULE_PATHNAME' LANGUAGE C;

plr.control

@@ -1,5 +1,5 @@
 # plr extension
 comment = 'load R interpreter and execute R script from within a database'
-default_version = '8.5'
+default_version = '8.4'
 module_pathname = '$libdir/plr'
 relocatable = true

plr.vcxproj

@@ -82,7 +82,6 @@
       <Command>$(mingw)$(PlatformArchitecture)\bin\gendef.exe - "$(R_HOME)\bin\$(rbin)\R.dll" &gt; R$(PlatformTarget).def
 lib /def:R$(PlatformTarget).def /out:R$(PlatformTarget).lib /MACHINE:$(PlatformTarget)
 if "%CI%"=="" ( if not exist data "$(pgroot)\bin\initdb" -D data )
-if not exist plr.sql "$(sed)" -e "s#MODULE_PATHNAME#$libdir/plr#" plr.sql.in &gt; plr.sql
 </Command>
       <Outputs>R$(PlatformTarget).lib</Outputs>
       <Message>Generate R import library</Message>

sql/plr.sql

@@ -1,10 +1,5 @@
---
--- first, define the language and functions.  Turn off echoing so that expected file
--- does not depend on contents of plr.sql.
---
-\set ECHO none
-\i plr.sql
-\set ECHO all
+-- install extension
+create extension plr;
 
 -- make sure we get the notices
 set client_min_messages to notice;