feat: use icu for locales only if building orioledb

Author: samrose

ansible/tasks/setup-postgres.yml

@@ -204,23 +204,43 @@
     ansible_command_timeout: 60
   when: debpkg_mode
 
-- name: Initialize the database stage2_nix
-  become: yes
-  become_user: postgres
-  shell: source /var/lib/postgresql/.bashrc && /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data initdb -o "--allow-group-access" -o "--username=supabase_admin"
-  args:
-    executable: /bin/bash
-  environment:
-    LANG: en_US.UTF-8
-    LANGUAGE: en_US.UTF-8
-    LC_ALL: en_US.UTF-8
-    LC_CTYPE: en_US.UTF-8
-    LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
-  vars:
-    ansible_command_timeout: 60
-    # Circumvents the following error:
-    # "Timeout (12s) waiting for privilege escalation prompt"
-  when: stage2_nix 
+- name: Check psql_version and modify supautils.conf and postgresql.conf if necessary
+  block:
+    - name: Check if psql_version is psql_orioledb
+      set_fact:
+        is_psql_oriole: "{{ psql_version in ['psql_orioledb-16', 'psql_orioledb-17'] }}"
+
+    - name: Initialize the database stage2_nix (non-orioledb)
+      become: yes
+      become_user: postgres
+      shell: source /var/lib/postgresql/.bashrc && /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data initdb -o "--allow-group-access" -o "--username=supabase_admin"
+      args:
+        executable: /bin/bash
+      environment:
+        LANG: en_US.UTF-8
+        LANGUAGE: en_US.UTF-8
+        LC_ALL: en_US.UTF-8
+        LC_CTYPE: en_US.UTF-8
+        LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
+      vars:
+        ansible_command_timeout: 60
+      when: stage2_nix and not is_psql_oriole
+
+    - name: Initialize the database stage2_nix (orioledb)
+      become: yes
+      become_user: postgres
+      shell: source /var/lib/postgresql/.bashrc && /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data initdb -o "--allow-group-access" -o "--username=supabase_admin" -o "--locale-provider=icu" -o "--encoding=UTF-8" -o "--icu-locale=en_US.UTF-8"
+      args:
+        executable: /bin/bash
+      environment:
+        LANG: en_US.UTF-8
+        LANGUAGE: en_US.UTF-8
+        LC_ALL: en_US.UTF-8
+        LC_CTYPE: en_US.UTF-8
+        LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
+      vars:
+        ansible_command_timeout: 60
+      when: stage2_nix and is_psql_oriole
 
 - name: copy PG systemd unit
   template:

ansible/tasks/stage2-setup-postgres.yml

@@ -25,20 +25,23 @@
           /etc/postgresql-custom/supautils.conf
       when: is_psql_oriole and stage2_nix
       become: yes
+
     - name: Remove db_user_namespace from postgresql.conf if oriole-xx build
       ansible.builtin.command:
         cmd: >
           sed -i 's/db_user_namespace = off/#db_user_namespace = off/g;' 
           /etc/postgresql/postgresql.conf
       when: is_psql_oriole and stage2_nix
       become: yes
+
     - name: Append orioledb to shared_preload_libraries append within closing quote
       ansible.builtin.command:
         cmd: >
           sed -i 's/\(shared_preload_libraries.*\)'\''\(.*\)$/\1, orioledb'\''\2/'
           /etc/postgresql/postgresql.conf
       when: is_psql_oriole and stage2_nix
       become: yes
+
     - name: Add default_table_access_method setting
       ansible.builtin.lineinfile:
         path: /etc/postgresql/postgresql.conf
@@ -47,6 +50,18 @@
       when: is_psql_oriole and stage2_nix
       become: yes
 
+    - name: Add ICU locale settings
+      ansible.builtin.lineinfile:
+        path: /etc/postgresql/postgresql.conf
+        line: "{{ item }}"
+        state: present
+      with_items:
+        - "lc_collate = 'en-US-x-icu'"
+        - "lc_ctype = 'en-US-x-icu'"
+        - "icu_locale = 'en-US'"
+      when: is_psql_oriole and stage2_nix
+      become: yes
+
 - name: Install Git for Nix package management
   become: yes
   apt: