From a7e42e93cc5781e0208eb0e4589543bf4ca4ec6e Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Wed, 16 Mar 2016 16:41:54 +0100 Subject: [PATCH] Rename cdb_crankshaft_internal_version as internal function --- src/pg/sql/01_version.sql | 2 +- src/pg/sql/02_py.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pg/sql/01_version.sql b/src/pg/sql/01_version.sql index 90e6123..5c701fd 100644 --- a/src/pg/sql/01_version.sql +++ b/src/pg/sql/01_version.sql @@ -6,7 +6,7 @@ $$ language 'sql' IMMUTABLE STRICT; -- Internal identifier of the installed extension instence -- e.g. 'dev' for current development version -CREATE OR REPLACE FUNCTION cdb_crankshaft_internal_version() +CREATE OR REPLACE FUNCTION _cdb_crankshaft_internal_version() RETURNS text AS $$ SELECT installed_version FROM pg_available_extensions where name='crankshaft' and pg_available_extensions IS NOT NULL; $$ language 'sql' IMMUTABLE STRICT; diff --git a/src/pg/sql/02_py.sql b/src/pg/sql/02_py.sql index a233a0a..7da5f47 100644 --- a/src/pg/sql/02_py.sql +++ b/src/pg/sql/02_py.sql @@ -14,7 +14,7 @@ AS $$ import os # plpy.notice('%',str(os.environ)) # activate virtualenv - crankshaft_version = plpy.execute('SELECT cdb_crankshaft.cdb_crankshaft_internal_version()')[0]['cdb_crankshaft_internal_version'] + crankshaft_version = plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_internal_version()')[0]['_cdb_crankshaft_internal_version'] base_path = plpy.execute('SELECT cdb_crankshaft._cdb_crankshaft_virtualenvs_path()')[0]['_cdb_crankshaft_virtualenvs_path'] default_venv_path = os.path.join(base_path, crankshaft_version) venv_path = os.environ.get('CRANKSHAFT_VENV', default_venv_path)