Adapt to pgxntool 2.4.0 and fix tests for current PostgreSQL

Makefile

@@ -5,21 +5,6 @@ testdeps: $(TEST_SQL_FILES) $(TEST_SOURCE_FILES)
 
 testdeps: $(TESTDIR)/deps.sql $(TESTDIR)/load.sql
 
-#
-# Docs
-#
-ifeq (,$(ASCIIDOC))
-ASCIIDOC = $(shell which asciidoc)
-endif # ASCIIDOC
-ifneq (,$(ASCIIDOC))
-DOCS_built := $(DOCS:.asc=.html) $(DOCS:.adoc=.html)
-DOCS += $(DOCS_built)
-
-install: $(DOCS_built)
-%.html: %.asc
-	asciidoc $<
-endif # ASCIIDOC
-
 #
 # OTHER DEPS
 #

test/deps.sql

@@ -2,13 +2,6 @@
 
 -- Add any test dependency statements here
 --CREATE EXTENSION IF NOT EXISTS trunklet;
-DO $$ BEGIN
-  IF current_setting('server_version_num')::int < 100000 THEN
-    CREATE EXTENSION IF NOT EXISTS cat_tools;
-    CREATE EXTENSION IF NOT EXISTS trunklet;
-    CREATE EXTENSION IF NOT EXISTS extension_drop;
-  END IF;
-END$$;
 
 -- Have to reset our search_path
 --SET search_path = public,tap;
@@ -18,11 +11,7 @@ SET client_min_messages = WARNING -- Necessary due to CASCADE
 AS $body$
 BEGIN
 -- No IF NOT EXISTS because we'll be confused if we're not loading the new stuff
-  IF current_setting('server_version_num')::int < 100000 THEN
-    CREATE EXTENSION "trunklet-format" ;
-  ELSE
-    EXECUTE $exec$CREATE EXTENSION "trunklet-format" CASCADE$exec$;
-  END IF;
+  CREATE EXTENSION "trunklet-format" CASCADE;
 END
 $body$;
 

test/expected/base.out

@@ -1,4 +1,12 @@
 \set ECHO none
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
+psql:test/load.sql:5: WARNING:  function__arg_types_text() is deprecated, use routine__parse_arg_types_text instead
 
 ok 1
 ok 2