From 7fed2bcb181511e2bc2d619f1a01b6f8a63267fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 24 Dec 2019 00:16:50 +0100 Subject: [PATCH 1/3] Force to alter extension always as template_postgis may have the current version and the end the extension won't be installed --- app/models/user/db_service.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/models/user/db_service.rb b/app/models/user/db_service.rb index 2dd5f4fe97..771b3c65fe 100644 --- a/app/models/user/db_service.rb +++ b/app/models/user/db_service.rb @@ -683,11 +683,8 @@ module CartoDB RETURN; END; ver := '#{cdb_extension_target_version}'; - IF position('dev' in ver) > 0 THEN - EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || 'next'''; - EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || ''''; - ELSE - EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || ''''; + EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || 'next'''; + EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || ''''; END IF; END; $$; From 0eb65b9e283a5e5a40204b67827c43efa5f27932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 24 Dec 2019 00:27:28 +0100 Subject: [PATCH 2/3] Make it slowly my friend --- app/models/user/db_service.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/models/user/db_service.rb b/app/models/user/db_service.rb index 771b3c65fe..015aa2f768 100644 --- a/app/models/user/db_service.rb +++ b/app/models/user/db_service.rb @@ -685,7 +685,6 @@ module CartoDB ver := '#{cdb_extension_target_version}'; EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || 'next'''; EXECUTE 'ALTER EXTENSION cartodb UPDATE TO ''' || ver || ''''; - END IF; END; $$; }) From b3c9a2efb2d9dbfd10add776847f47779d3553d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 24 Dec 2019 00:37:47 +0100 Subject: [PATCH 3/3] Update NEWS and carto-package.json --- NEWS.md | 1 + carto-package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 5f3f2bbc11..3fbd325cfa 100644 --- a/NEWS.md +++ b/NEWS.md @@ -21,6 +21,7 @@ sudo make install - Add enpoints to list, register, update, and unregister Federated Servers - Add enpoints to list Remote Schemas - Add enpoints to list, register, update, and unregister Remote Tables +- Fixed issue while creating a new user's database: force to alter extension always as template_postgis may have the current version defined and the extension won't be installed ### Bug fixes / enhancements - Avoid warnings when running test in parallel with an empty environment diff --git a/carto-package.json b/carto-package.json index 543fdb4072..a5801bad5d 100644 --- a/carto-package.json +++ b/carto-package.json @@ -12,7 +12,7 @@ }, "works_with": { "dataservices-api-client-extension": "0.27.0", - "carto_postgresql_ext": "0.31.0", + "carto_postgresql_ext": "0.33.0", "odbc_fdw": "0.4.0", "carto_windshaft": ">=6.2.0", "carto_sql_api": ">=2.1.0",