cartodb4/crankshaft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename cdb_crankshaft_internal_version as internal function

Browse Source
This commit is contained in:
Javier Goizueta 2016-03-16 16:41:54 +01:00
parent bad09ffd7b
commit a7e42e93cc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pg/sql/01_version.sql
View File

@ -6,7 +6,7 @@ $$ language 'sql' IMMUTABLE STRICT;
-- Internal identifier of the installed extension instence -- Internal identifier of the installed extension instence
-- e.g. 'dev' for current development version -- 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 $$ RETURNS text AS $$
SELECT installed_version FROM pg_available_extensions where name='crankshaft' and pg_available_extensions IS NOT NULL; SELECT installed_version FROM pg_available_extensions where name='crankshaft' and pg_available_extensions IS NOT NULL;
$$ language 'sql' IMMUTABLE STRICT; $$ language 'sql' IMMUTABLE STRICT;

2
src/pg/sql/02_py.sql
View File

@ -14,7 +14,7 @@ AS $$
import os import os
# plpy.notice('%',str(os.environ)) # plpy.notice('%',str(os.environ))
# activate virtualenv # 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'] 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) default_venv_path = os.path.join(base_path, crankshaft_version)
venv_path = os.environ.get('CRANKSHAFT_VENV', default_venv_path) venv_path = os.environ.get('CRANKSHAFT_VENV', default_venv_path)