Substitute python version for atc python test

knizhnik · knizhnik · commit e0ddf6664ad8 · 2016-12-07T10:50:34.000+03:00
diff --git a/configure b/configure
@@ -17924,7 +17924,7 @@ fi
 
 
 
-ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"
+ac_config_files="$ac_config_files GNUmakefile src/Makefile.global src/test/regress/sql/atx.sql src/test/regress/expected/atx.out"
 
 
 ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"
diff --git a/configure.in b/configure.in
@@ -2297,7 +2297,7 @@ AC_SUBST(vpath_build)
 
 AC_SUBST(PGPRO_VERSION)
 
-AC_CONFIG_FILES([GNUmakefile src/Makefile.global])
+AC_CONFIG_FILES([GNUmakefile src/Makefile.global src/test/regress/sql/atx.sql src/test/regress/expected/atx.out])
 
 AC_CONFIG_LINKS([
   src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c
diff --git a/src/test/regress/expected/atx.out.in b/src/test/regress/expected/atx.out.in
@@ -164,7 +164,7 @@ select tid, table_name, action, old_data, new_data, query from atx_actions;
 (4 rows)
 
 --- plpythonu ---
-create extension if not exists plpythonu;
+create extension if not exists plpython@python_majorversion@u;
 drop table atx_test;
 create table atx_test(a text, b int);
 create or replace function pythonomous() returns void as $$
@@ -177,7 +177,7 @@ create or replace function pythonomous() returns void as $$
 		print("error: %s" % e.args)
 
 	plpy.execute("insert into atx_test values ('csd', 'csd')")
-$$ language plpythonu;
+$$ language plpython@python_majorversion@u;
 select pythonomous();
 ERROR:  spiexceptions.InvalidTextRepresentation: invalid input syntax for integer: "csd"
 LINE 1: insert into atx_test values ('csd', 'csd')
diff --git a/src/test/regress/sql/atx.sql.in b/src/test/regress/sql/atx.sql.in
@@ -142,7 +142,7 @@ select tid, table_name, action, old_data, new_data, query from atx_actions;
 
 --- plpythonu ---
 
-create extension if not exists plpythonu;
+create extension if not exists plpython@python_majorversion@u;
 
 drop table atx_test;
 create table atx_test(a text, b int);
@@ -157,7 +157,7 @@ create or replace function pythonomous() returns void as $$
 		print("error: %s" % e.args)
 
 	plpy.execute("insert into atx_test values ('csd', 'csd')")
-$$ language plpythonu;
+$$ language plpython@python_majorversion@u;
 
 select pythonomous();
 select * from atx_test; -- you should see (bsd, 456)

Original file line number	Diff line number	Diff line change
`@@ -17924,7 +17924,7 @@ fi`
`17924`	`17924`
`17925`	`17925`
`17926`	`17926`
`17927`		`-ac_config_files="$ac_config_files GNUmakefile src/Makefile.global"`
	`17927`	`+ac_config_files="$ac_config_files GNUmakefile src/Makefile.global src/test/regress/sql/atx.sql src/test/regress/expected/atx.out"`
`17928`	`17928`
`17929`	`17929`
`17930`	`17930`	`ac_config_links="$ac_config_links src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c src/backend/port/pg_sema.c:${SEMA_IMPLEMENTATION} src/backend/port/pg_shmem.c:${SHMEM_IMPLEMENTATION} src/include/dynloader.h:src/backend/port/dynloader/${template}.h src/include/pg_config_os.h:src/include/port/${template}.h src/Makefile.port:src/makefiles/Makefile.${template}"`