initdb parameter modified for pg_upgrade

Author: Schmaetz

major_upgrade/pg_upgrade.py

@@ -187,10 +187,10 @@ def pg_upgrade(self, check=False):
 
     def prepare_new_pgdata(self, version):
         from spilo_commons import append_extensions
-
-        locale = self.query('SHOW lc_collate')[0][0]
-        encoding = self.query('SHOW server_encoding')[0][0]
-        initdb_config = [{'locale': locale}, {'encoding': encoding}]
+        
+        locale = self.query("SELECT datcollate FROM pg_database WHERE datname = 'template1'")[0][0]
+        # encoding = self.query('SHOW server_encoding')[0][0]
+        initdb_config = [{'locale': locale}, {'locale-provider': 'icu'}]
         if self.query("SELECT current_setting('data_checksums')::bool")[0][0]:
             initdb_config.append('data-checksums')
 

scripts/configure_spilo.py

@@ -255,7 +255,6 @@ def deep_update(a, b):
       --port={{CLONE_PORT}} --user="{{CLONE_USER}}"
   {{/CLONE_WITH_BASEBACKUP}}
   initdb:
-    - encoding: UTF8
     - locale: {{INITDB_LOCALE}}.UTF-8
     - data-checksums
     - locale-provider: icu