mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-01 19:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

plpython: Remove plpythonu, plpython2u and associated transform extensions.

Browse Source 
Since 19252e8ec9 we reject Python 2 during build configuration. Now that the
dust on the buildfarm has settled, remove extension variants specific to
Python 2.

Reviewed-By: Peter Eisentraut <peter@eisentraut.org>
Reviewed-By: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/20211031184548.g4sxfe47n2kyi55r@alap3.anarazel.de
This commit is contained in:
Andres Freund 2022-03-07 18:19:56 -08:00
parent 5b81703787
commit 76a29adee7
19 changed files with 7 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/hstore_plpython/Makefile
View File

@ -6,8 +6,8 @@ OBJS = \
hstore_plpython.o
PGFILEDESC = "hstore_plpython - hstore transform for plpython"
EXTENSION = hstore_plpythonu hstore_plpython2u hstore_plpython3u
DATA = hstore_plpythonu--1.0.sql hstore_plpython2u--1.0.sql hstore_plpython3u--1.0.sql
EXTENSION = hstore_plpython3u
DATA = hstore_plpython3u--1.0.sql
REGRESS = hstore_plpython
REGRESS_PLPYTHON3_MANGLE := $(REGRESS)

19
contrib/hstore_plpython/hstore_plpython2u--1.0.sql
View File

@ -1,19 +0,0 @@
/* contrib/hstore_plpython/hstore_plpython2u--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION hstore_plpython2u" to load this file. \quit
CREATE FUNCTION hstore_to_plpython2(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME', 'hstore_to_plpython';
CREATE FUNCTION plpython2_to_hstore(val internal) RETURNS hstore
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME', 'plpython_to_hstore';
CREATE TRANSFORM FOR hstore LANGUAGE plpython2u (
FROM SQL WITH FUNCTION hstore_to_plpython2(internal),
TO SQL WITH FUNCTION plpython2_to_hstore(internal)
);
COMMENT ON TRANSFORM FOR hstore LANGUAGE plpython2u IS 'transform between hstore and Python dict';

6
contrib/hstore_plpython/hstore_plpython2u.control
View File

@ -1,6 +0,0 @@
# hstore_plpython2u extension
comment = 'transform between hstore and plpython2u'
default_version = '1.0'
module_pathname = '$libdir/hstore_plpython2'
relocatable = true
requires = 'hstore,plpython2u'

19
contrib/hstore_plpython/hstore_plpythonu--1.0.sql
View File

@ -1,19 +0,0 @@
/* contrib/hstore_plpython/hstore_plpythonu--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION hstore_plpythonu" to load this file. \quit
CREATE FUNCTION hstore_to_plpython(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython_to_hstore(val internal) RETURNS hstore
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME';
CREATE TRANSFORM FOR hstore LANGUAGE plpythonu (
FROM SQL WITH FUNCTION hstore_to_plpython(internal),
TO SQL WITH FUNCTION plpython_to_hstore(internal)
);
COMMENT ON TRANSFORM FOR hstore LANGUAGE plpythonu IS 'transform between hstore and Python dict';

6
contrib/hstore_plpython/hstore_plpythonu.control
View File

@ -1,6 +0,0 @@
# hstore_plpythonu extension
comment = 'transform between hstore and plpythonu'
default_version = '1.0'
module_pathname = '$libdir/hstore_plpython2'
relocatable = true
requires = 'hstore,plpythonu'

6
contrib/jsonb_plpython/Makefile
View File

@ -4,12 +4,12 @@ MODULE_big = jsonb_plpython$(python_majorversion)
OBJS = \
$(WIN32RES) \
jsonb_plpython.o
PGFILEDESC = "jsonb_plpython - transform between jsonb and plpythonu"
PGFILEDESC = "jsonb_plpython - jsonb transform for plpython"
PG_CPPFLAGS = -I$(top_srcdir)/src/pl/plpython $(python_includespec) -DPLPYTHON_LIBNAME='"plpython$(python_majorversion)"'
EXTENSION = jsonb_plpythonu jsonb_plpython2u jsonb_plpython3u
DATA = jsonb_plpythonu--1.0.sql jsonb_plpython2u--1.0.sql jsonb_plpython3u--1.0.sql
EXTENSION = jsonb_plpython3u
DATA = jsonb_plpython3u--1.0.sql
REGRESS = jsonb_plpython
REGRESS_PLPYTHON3_MANGLE := $(REGRESS)

19
contrib/jsonb_plpython/jsonb_plpython2u--1.0.sql
View File

@ -1,19 +0,0 @@
/* contrib/jsonb_plpython/jsonb_plpython2u--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION jsonb_plpython2u" to load this file. \quit
CREATE FUNCTION jsonb_to_plpython2(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME', 'jsonb_to_plpython';
CREATE FUNCTION plpython2_to_jsonb(val internal) RETURNS jsonb
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME', 'plpython_to_jsonb';
CREATE TRANSFORM FOR jsonb LANGUAGE plpython2u (
FROM SQL WITH FUNCTION jsonb_to_plpython2(internal),
TO SQL WITH FUNCTION plpython2_to_jsonb(internal)
);
COMMENT ON TRANSFORM FOR jsonb LANGUAGE plpython2u IS 'transform between jsonb and Python';

6
contrib/jsonb_plpython/jsonb_plpython2u.control
View File

@ -1,6 +0,0 @@
# jsonb_plpython2u extension
comment = 'transform between jsonb and plpython2u'
default_version = '1.0'
module_pathname = '$libdir/jsonb_plpython2'
relocatable = true
requires = 'plpython2u'

19
contrib/jsonb_plpython/jsonb_plpythonu--1.0.sql
View File

@ -1,19 +0,0 @@
/* contrib/jsonb_plpython/jsonb_plpythonu--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION jsonb_plpythonu" to load this file. \quit
CREATE FUNCTION jsonb_to_plpython(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython_to_jsonb(val internal) RETURNS jsonb
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME';
CREATE TRANSFORM FOR jsonb LANGUAGE plpythonu (
FROM SQL WITH FUNCTION jsonb_to_plpython(internal),
TO SQL WITH FUNCTION plpython_to_jsonb(internal)
);
COMMENT ON TRANSFORM FOR jsonb LANGUAGE plpythonu IS 'transform between jsonb and Python';

6
contrib/jsonb_plpython/jsonb_plpythonu.control
View File

@ -1,6 +0,0 @@
# jsonb_plpythonu extension
comment = 'transform between jsonb and plpythonu'
default_version = '1.0'
module_pathname = '$libdir/jsonb_plpython2'
relocatable = true
requires = 'plpythonu'

4
contrib/ltree_plpython/Makefile
View File

@ -6,8 +6,8 @@ OBJS = \
ltree_plpython.o
PGFILEDESC = "ltree_plpython - ltree transform for plpython"
EXTENSION = ltree_plpythonu ltree_plpython2u ltree_plpython3u
DATA = ltree_plpythonu--1.0.sql ltree_plpython2u--1.0.sql ltree_plpython3u--1.0.sql
EXTENSION = ltree_plpython3u
DATA = ltree_plpython3u--1.0.sql
REGRESS = ltree_plpython
REGRESS_PLPYTHON3_MANGLE := $(REGRESS)

12
contrib/ltree_plpython/ltree_plpython2u--1.0.sql
View File

@ -1,12 +0,0 @@
/* contrib/ltree_plpython/ltree_plpython2u--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION ltree_plpython2u" to load this file. \quit
CREATE FUNCTION ltree_to_plpython2(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME', 'ltree_to_plpython';
CREATE TRANSFORM FOR ltree LANGUAGE plpython2u (
FROM SQL WITH FUNCTION ltree_to_plpython2(internal)
);

6
contrib/ltree_plpython/ltree_plpython2u.control
View File

@ -1,6 +0,0 @@
# ltree_plpython2u extension
comment = 'transform between ltree and plpython2u'
default_version = '1.0'
module_pathname = '$libdir/ltree_plpython2'
relocatable = true
requires = 'ltree,plpython2u'

12
contrib/ltree_plpython/ltree_plpythonu--1.0.sql
View File

@ -1,12 +0,0 @@
/* contrib/ltree_plpython/ltree_plpythonu--1.0.sql */
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
\echo Use "CREATE EXTENSION ltree_plpythonu" to load this file. \quit
CREATE FUNCTION ltree_to_plpython(val internal) RETURNS internal
LANGUAGE C STRICT IMMUTABLE
AS 'MODULE_PATHNAME';
CREATE TRANSFORM FOR ltree LANGUAGE plpythonu (
FROM SQL WITH FUNCTION ltree_to_plpython(internal)
);

6
contrib/ltree_plpython/ltree_plpythonu.control
View File

@ -1,6 +0,0 @@
# ltree_plpythonu extension
comment = 'transform between ltree and plpythonu'
default_version = '1.0'
module_pathname = '$libdir/ltree_plpython2'
relocatable = true
requires = 'ltree,plpythonu'

17
src/pl/plpython/plpython2u--1.0.sql
View File

@ -1,17 +0,0 @@
/* src/pl/plpython/plpython2u--1.0.sql */
CREATE FUNCTION plpython2_call_handler() RETURNS language_handler
LANGUAGE c AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython2_inline_handler(internal) RETURNS void
STRICT LANGUAGE c AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython2_validator(oid) RETURNS void
STRICT LANGUAGE c AS 'MODULE_PATHNAME';
CREATE LANGUAGE plpython2u
HANDLER plpython2_call_handler
INLINE plpython2_inline_handler
VALIDATOR plpython2_validator;
COMMENT ON LANGUAGE plpython2u IS 'PL/Python2U untrusted procedural language';

7
src/pl/plpython/plpython2u.control
View File

@ -1,7 +0,0 @@
# plpython2u extension
comment = 'PL/Python2U untrusted procedural language'
default_version = '1.0'
module_pathname = '$libdir/plpython2'
relocatable = false
schema = pg_catalog
superuser = true

17
src/pl/plpython/plpythonu--1.0.sql
View File

@ -1,17 +0,0 @@
/* src/pl/plpython/plpythonu--1.0.sql */
CREATE FUNCTION plpython_call_handler() RETURNS language_handler
LANGUAGE c AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython_inline_handler(internal) RETURNS void
STRICT LANGUAGE c AS 'MODULE_PATHNAME';
CREATE FUNCTION plpython_validator(oid) RETURNS void
STRICT LANGUAGE c AS 'MODULE_PATHNAME';
CREATE LANGUAGE plpythonu
HANDLER plpython_call_handler
INLINE plpython_inline_handler
VALIDATOR plpython_validator;
COMMENT ON LANGUAGE plpythonu IS 'PL/PythonU untrusted procedural language';

7
src/pl/plpython/plpythonu.control
View File

@ -1,7 +0,0 @@
# plpythonu extension
comment = 'PL/PythonU untrusted procedural language'
default_version = '1.0'
module_pathname = '$libdir/plpython2'
relocatable = false
schema = pg_catalog
superuser = true