From c6e571190595ce54e154fda71310e2ec5e81a811 Mon Sep 17 00:00:00 2001 From: manmorjim Date: Fri, 6 Mar 2020 17:57:02 +0100 Subject: [PATCH] Replace @@plpythonu@@ var in old_versions --- client/Makefile | 8 ++++++++ client/cdb_dataservices_client--0.28.0.sql | 4 ++-- .../cdb_dataservices_client--0.21.0--0.22.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.22.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.23.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.24.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.25.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.26.0.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.26.1.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.26.2.sql | 4 ++-- client/old_versions/cdb_dataservices_client--0.27.0.sql | 4 ++-- 11 files changed, 28 insertions(+), 20 deletions(-) diff --git a/client/Makefile b/client/Makefile index 3e517e6..bbf9a44 100644 --- a/client/Makefile +++ b/client/Makefile @@ -96,6 +96,9 @@ devclean: rm -f $(NEW_EXTENSION_ARTIFACT) rm -f $(GENERATED_SQL_FILES) rm -rf $(TEST_DIR) + for f in $(OLD_VERSIONS); do \ + mv $${f}.bak $${f} || true; \ + done # If needed remove PARALLEL tags from the release files release_remove_parallel_deploy: @@ -122,6 +125,11 @@ replace_variables: sed -e 's/@@plpythonu@@/$(PLPYTHONU)/g' \ >> $(TEST_DIR)/expected/$${f}.out; \ done + for f in $(OLD_VERSIONS); do \ + mv $${f}.bak $${f} || true; \ + sed --in-place=.bak -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}; \ + echo "sed --in-place=.bak -e 's/@@plpythonu@@/$(PLPYTHONU)/g' $${f}"; \ + done # Install the current release into the PostgreSQL extensions directory deploy: release_remove_parallel_deploy diff --git a/client/cdb_dataservices_client--0.28.0.sql b/client/cdb_dataservices_client--0.28.0.sql index 035f6c8..058a233 100644 --- a/client/cdb_dataservices_client--0.28.0.sql +++ b/client/cdb_dataservices_client--0.28.0.sql @@ -2172,7 +2172,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -2265,7 +2265,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.21.0--0.22.0.sql b/client/old_versions/cdb_dataservices_client--0.21.0--0.22.0.sql index 59af158..7042e4c 100644 --- a/client/old_versions/cdb_dataservices_client--0.21.0--0.22.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.21.0--0.22.0.sql @@ -1612,7 +1612,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -1705,7 +1705,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.22.0.sql b/client/old_versions/cdb_dataservices_client--0.22.0.sql index 2c8bdf5..9306b2f 100644 --- a/client/old_versions/cdb_dataservices_client--0.22.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.22.0.sql @@ -1652,7 +1652,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -1745,7 +1745,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.23.0.sql b/client/old_versions/cdb_dataservices_client--0.23.0.sql index 8732e8e..2c9b919 100644 --- a/client/old_versions/cdb_dataservices_client--0.23.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.23.0.sql @@ -1727,7 +1727,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -1820,7 +1820,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.24.0.sql b/client/old_versions/cdb_dataservices_client--0.24.0.sql index 14a3af6..abc6c6d 100644 --- a/client/old_versions/cdb_dataservices_client--0.24.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.24.0.sql @@ -1802,7 +1802,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -1895,7 +1895,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.25.0.sql b/client/old_versions/cdb_dataservices_client--0.25.0.sql index 608684b..f2a0f99 100644 --- a/client/old_versions/cdb_dataservices_client--0.25.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.25.0.sql @@ -1886,7 +1886,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -1979,7 +1979,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.26.0.sql b/client/old_versions/cdb_dataservices_client--0.26.0.sql index f3f8201..4c3d47c 100644 --- a/client/old_versions/cdb_dataservices_client--0.26.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.26.0.sql @@ -2072,7 +2072,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -2165,7 +2165,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.26.1.sql b/client/old_versions/cdb_dataservices_client--0.26.1.sql index 94b5fe7..b1f649b 100644 --- a/client/old_versions/cdb_dataservices_client--0.26.1.sql +++ b/client/old_versions/cdb_dataservices_client--0.26.1.sql @@ -2072,7 +2072,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -2165,7 +2165,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.26.2.sql b/client/old_versions/cdb_dataservices_client--0.26.2.sql index 4b387c7..f04c481 100644 --- a/client/old_versions/cdb_dataservices_client--0.26.2.sql +++ b/client/old_versions/cdb_dataservices_client--0.26.2.sql @@ -2072,7 +2072,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -2165,7 +2165,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text, diff --git a/client/old_versions/cdb_dataservices_client--0.27.0.sql b/client/old_versions/cdb_dataservices_client--0.27.0.sql index e6f8feb..f671a36 100644 --- a/client/old_versions/cdb_dataservices_client--0.27.0.sql +++ b/client/old_versions/cdb_dataservices_client--0.27.0.sql @@ -2143,7 +2143,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PrepareTableOBS_GetMeas ) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMeasure( username text, @@ -2236,7 +2236,7 @@ CREATE OR REPLACE FUNCTION cdb_dataservices_client.__DST_PopulateTableOBS_GetMea fdw_server=plpy.quote_literal(server_name))) return True -$$ LANGUAGE plpythonu VOLATILE PARALLEL UNSAFE; +$$ LANGUAGE @@plpythonu@@ VOLATILE PARALLEL UNSAFE; CREATE OR REPLACE FUNCTION cdb_dataservices_client._DST_ConnectUserTable( username text,