postgres tests

* #5053 fix data format when boot from sd card

build_sdcard.sh

@@ -28,7 +28,7 @@ if [ "$1" != "-EXPORT" ] && [ "$1" != "EXPORT" ]; then
 fi
 
 defaultRepo="raspiblitz" # user that hosts a `raspiblitz` repo
-defaultBranch="v1.11" # latest version branch
+defaultBranch="v1.12" # latest version branch
 
 defaultAPIuser="fusion44"
 defaultAPIrepo="blitz_api"
@@ -351,6 +351,14 @@ sudo sed -i '/^en_GB.UTF-8/s/^/#/' /etc/locale.gen
 sudo locale-gen
 echo -e "LANG=en_US.UTF-8\nLANGUAGE=en_US.UTF-8\nLC_ALL=en_US.UTF-8" | sudo tee /etc/default/locale > /dev/null
 
+echo "*** Setting Fallback DNS ***"
+connName=$(nmcli -g GENERAL.CONNECTION device show eth0 2>/dev/null)
+echo "current nmcli eth0 connection (${connName})"
+if [ "${connName}" != "" ]; then
+  echo "Adding DNS fallback servers ..."
+  nmcli connection modify "${connName}" ipv4.dns "208.67.222.222,208.67.220.220,1.1.1.1" ipv4.dns-priority -1 ipv4.ignore-auto-dns no
+fi
+
 echo "*** Remove unnecessary packages ***"
 unnecessary_packages=(libreoffice* oracle-java* chromium-browser nuscratch scratch sonic-pi plymouth python2 vlc* cups* libcups* libcamera* firefox* ffmpeg libpostproc* eom* evince*)
 for pkg in "${unnecessary_packages[@]}"; do
@@ -364,8 +372,6 @@ done
 apt-get clean -y
 apt-get autoremove -y
 
-grep -q "^nameserver 8.8.8.8$" /etc/resolv.conf || echo "nameserver 8.8.8.8" >> /etc/resolv.conf
-
 echo -e "\n*** UPDATE Debian***"  # add sources if not present
 echo -e "checking/adding sources ..."
 for SOURCE in "${REQUIRED_SOURCES[@]}"; do
@@ -401,7 +407,7 @@ echo -e "\n*** SOFTWARE UPDATE ***"
 # sqlite3 -> database
 # fdisk -> create partitions
 # lsb-release -> needed to know which distro version we're running to add APT sources
-general_utils="sudo policykit-1 htop git curl bash-completion vim jq dphys-swapfile bsdmainutils autossh telnet vnstat parted dosfstools fbi sysbench build-essential dialog bc python3-dialog unzip whois fdisk lsb-release smartmontools rsyslog qrencode"
+general_utils="sudo policykit-1 htop git curl bash-completion vim jq dphys-swapfile bsdmainutils autossh telnet vnstat parted dosfstools fbi sysbench build-essential dialog bc python3-dialog unzip whois fdisk lsb-release smartmontools rsyslog qrencode dnsutils"
 # add btrfs-progs if not bookworm on aarch64
 [ "${architecture}" = "aarch64" ] && ! grep "12 (bookworm)" < /etc/os-release && general_utils="${general_utils} btrfs-progs"
 # python3-mako --> https://github.com/rootzoll/raspiblitz/issues/3441
@@ -710,6 +716,8 @@ sudo -u admin chmod +x /home/admin/config.scripts/*.sh || exit 1
 sudo -u admin cp -r /home/admin/raspiblitz/home.admin/setup.scripts /home/admin/ || exit 1
 sudo -u admin chmod +x /home/admin/setup.scripts/*.sh || exit 1
 sudo -u admin git config --global --add safe.directory /home/admin/raspiblitz
+# Also configure safe.directory for root user in case root processes need to access the repo
+git config --global --add safe.directory /home/admin/raspiblitz
 
 # install newest version of BlitzPy
 blitzpy_wheel=$(ls -tR /home/admin/raspiblitz/home.admin/BlitzPy/dist | grep -E "any.whl" | tail -n 1)

home.admin/config.scripts/blitz.data.sh

@@ -329,7 +329,7 @@ if [ "$action" = "status" ]; then
                 fi
 
             # Check SYSTEM DRIVE
-            elif [ -d "${mountPath}/boot" ] && [ -d "${mountPath}/home/admin/raspiblitz" ] && [ ${size} -gt 7 ] && [ "${storageDevice}" != "" ]; then
+            elif [ -d "${mountPath}/boot" ] && [ -d "${mountPath}/home/admin/raspiblitz" ] && [ ${size} -gt 7 ]; then
 
                 # check for unclean setups
                 if [ -d "${mountPath}/app-storage" ]; then
@@ -656,24 +656,24 @@ if [ "$action" = "status" ]; then
 
     # STORAGE
     if [ ${#storageDevice} -gt 0 ]; then
-        if [ ${storageSizeGB} -lt $(storageFullMinGB) ]; then
+        if [ ${storageSizeGB} -lt ${storageFullMinGB} ]; then
             storageWarning='only-pruned'
         fi
-        if [ ${storageSizeGB} -lt $(storagePrunedMinGB) ]; then
+        if [ ${storageSizeGB} -lt ${storagePrunedMinGB} ]; then
             storageWarning='too-small'
         fi
     fi
 
     # SYSTEM
     if [ ${#systemDevice} -gt 0 ] && [ ${bootFromStorage} -eq 0 ]; then
-        if [ ${systemSizeGB} -lt $((systemMinGB - 1)) ]; then
+        if [ ${systemSizeGB} -lt ${systemMinGB} ]; then
             systemWarning='too-small'
         fi
     fi
 
     # DATA
     if [ ${#dataDevice} -gt 0 ]; then
-        if [ ${dataSizeGB} -lt $((dataMinGB - 1)) ]; then
+        if [ ${dataSizeGB} -lt ${dataMinGB} ]; then
             dataWarning='too-small'
         fi
     fi
@@ -1854,11 +1854,15 @@ if [ "$action" = "recover" ] || [ "$action" = "clean" ]; then
             # get number of partions of device
             numPartitions=$(lsblk -no NAME /dev/${actionDevice} | grep -c "${actionDevicePartitionBase}")
             if [ ${numPartitions} -eq 3 ]; then
-                echo "# .. formating boot & system partition" >> ${logFile}
-                wipefs -a /dev/${actionDevicePartitionBase}1 >> ${logFile}
-                mkfs.fat -F 32 /dev/${actionDevicePartitionBase}1 >> ${logFile}
-                wipefs -a /dev/${actionDevicePartitionBase}2 >> ${logFile}
-                mkfs -t ext4  /dev/${actionDevicePartitionBase}2 >> ${logFile}
+                if [ "${actionCreateSystemPartition}" == "1" ]; then
+                    echo "# .. formating boot & system partition" >> ${logFile}
+                    wipefs -a /dev/${actionDevicePartitionBase}1 >> ${logFile}
+                    mkfs.fat -F 32 /dev/${actionDevicePartitionBase}1 >> ${logFile}
+                    wipefs -a /dev/${actionDevicePartitionBase}2 >> ${logFile}
+                    mkfs -t ext4  /dev/${actionDevicePartitionBase}2 >> ${logFile}
+                else
+                    echo "# dont format boot & system partition .. actionCreateSystemPartition(${actionCreateSystemPartition})" >> ${logFile}  
+                fi
                 echo "storagePartition='${actionDevicePartitionBase}3'"
                 echo "# storagePartition(${actionDevicePartitionBase}3)" >> ${logFile}
             else

home.admin/config.scripts/blitz.web.api.sh

@@ -188,6 +188,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     GITHUB_USER="${defaultAPIuser}"
     GITHUB_REPO="${defaultAPIrepo}"
     activeBranch=$(git -C /home/admin/raspiblitz branch --show-current)
+    if [ "${activeBranch}" == "" ]; then
+      echo "# activeBranch not detected by git command, trying build script repo(${githubBranch})"
+      activeBranch="${githubBranch}"
+    fi
     echo "# activeBranch detected by raspiblitz repo: ${activeBranch}"
     if [[ "$activeBranch" == *"dev"* || "$activeBranch" != v* ]]; then
       echo "# RELEASE CANDIDATE: using dev branch"

home.admin/config.scripts/blitz.web.ui.sh

@@ -54,6 +54,10 @@ if [ "$1" = "1" ] || [ "$1" = "on" ]; then
     GITHUB_USER="${defaultWEBUIuser}"
     GITHUB_REPO="${defaultWEBUIrepo}"
     activeBranch=$(git -C /home/admin/raspiblitz branch --show-current)
+    if [ "${activeBranch}" == "" ]; then
+      echo "# activeBranch not detected by git command, trying build script repo(${githubBranch})"
+      activeBranch="${githubBranch}"
+    fi
     echo "# activeBranch detected by raspiblitz repo: ${activeBranch}"
     # use dev branch when raspiblitz repo is n dev branch
     if [[ "$activeBranch" == *"dev"* || "$activeBranch" != v* ]]; then

home.admin/config.scripts/cl.check.sh

@@ -76,7 +76,7 @@ if [ "$1" == "prestart" ]; then
       echo "grpc-port=${portprefix}4772" | tee -a ${CLCONF}
     fi
     echo "# Make sure that the correct GRPC port is used for $NETWORK"
-    sed -i "/^grpc-port=*/grpc-port=${portprefix}4772/g" ${CLCONF}
+    sed -i "s/^grpc-port=.*/grpc-port=${portprefix}4772/g" ${CLCONF}
   else
     echo "# The cln-grpc plugin is not present but in config"
     sed -i "/^grpc-port/d" ${CLCONF}
@@ -94,8 +94,8 @@ if [ "$1" == "prestart" ]; then
       echo "clnrest-host=0.0.0.0" | tee -a ${CLCONF}
     fi
     echo "# Make sure that the correct clnrest port is used for $NETWORK"
-    sed -i "s/^clnrest-port=*/clnrest-port=${portprefix}7378/g" ${CLCONF}
-    sed -i "s/^clnrest-host=*/clnrest-host=0.0.0.0/g" ${CLCONF}
+    sed -i "s/^clnrest-port=.*/clnrest-port=${portprefix}7378/g" ${CLCONF}
+    sed -i "s/^clnrest-host=.*/clnrest-host=0.0.0.0/g" ${CLCONF}
   else
     echo "# The clnrest plugin is not present but in config"
     sed -i "/^clnrest-port/d" ${CLCONF}

home.admin/config.scripts/internet.dns.sh

@@ -48,6 +48,7 @@ Do you want to set the fixed DNS 1.1.1.1 by Cloudflare (they claim they provide
     autoreboot=1
   else
     echo "# Ignoring DNS-Test fail"
+    exit 0
   fi
 
 fi

test/bonus.postgresql-15.bats

@@ -82,6 +82,127 @@
   [ "$?" -eq 0 ]
 }
 
+@test "Test PostgreSQL with locale change from en_GB to en_US" {
+  # Save current locale settings
+  original_locale=$(locale | grep LANG= | cut -d= -f2)
+  original_lc_all=$(locale | grep LC_ALL= | cut -d= -f2 || echo "")
+
+  # Step 1: Set up system with en_GB locale
+  echo "# Setting up en_GB locale"
+  sudo sed -i '/^#en_GB.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+  sudo sed -i '/^# en_GB.UTF-8 UTF-8/s/^# //' /etc/locale.gen
+  sudo locale-gen en_GB.UTF-8
+  export LANG=en_GB.UTF-8
+  export LC_ALL=en_GB.UTF-8
+
+  # Step 2: Install PostgreSQL with en_GB locale
+  echo "# Installing PostgreSQL with en_GB locale"
+  run ../home.admin/config.scripts/bonus.postgresql.sh on
+  [ "$status" -eq 0 ]
+
+  # Verify PostgreSQL is running
+  run pg_lsclusters
+  [ "$status" -eq 0 ]
+
+  # Step 3: Create test database and user with en_GB locale
+  echo "# Creating test database with en_GB locale"
+  sudo -u postgres psql -c "CREATE DATABASE testdb_locale TEMPLATE template0 LC_CTYPE 'en_GB.UTF-8' LC_COLLATE 'en_GB.UTF-8' ENCODING 'UTF8';"
+  sudo -u postgres psql -c "CREATE USER testuser_locale WITH ENCRYPTED PASSWORD 'raspiblitz';"
+  sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE testdb_locale TO testuser_locale;"
+
+  # Insert test data with locale-specific content
+  sudo -u postgres psql testdb_locale -c "CREATE TABLE test_data (id SERIAL PRIMARY KEY, name TEXT, amount DECIMAL(10,2));"
+  sudo -u postgres psql testdb_locale -c "INSERT INTO test_data (name, amount) VALUES ('Test £100.50', 100.50);"
+  sudo -u postgres psql testdb_locale -c "INSERT INTO test_data (name, amount) VALUES ('Test €200.75', 200.75);"
+
+  # Verify database creation and locale
+  run sudo -u postgres psql -l
+  echo "$output" | grep -q "testdb_locale"
+  [ "$?" -eq 0 ]
+
+  # Check database locale settings
+  db_locale=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_COLLATE;" | xargs)
+  echo "# Database locale: $db_locale"
+  [[ "$db_locale" == *"en_GB"* ]]
+
+  # Step 4: Create backup of the test database
+  echo "# Creating backup of test database"
+  sudo mkdir -p /tmp/pg_locale_test
+  sudo -u postgres pg_dump testdb_locale > /tmp/pg_locale_test/testdb_backup.sql
+  [ -f /tmp/pg_locale_test/testdb_backup.sql ]
+
+  # Step 5: Change system locale to en_US
+  echo "# Changing system locale to en_US"
+  sudo sed -i '/^#en_US.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+  sudo sed -i '/^# en_US.UTF-8 UTF-8/s/^# //' /etc/locale.gen
+  sudo locale-gen en_US.UTF-8
+  export LANG=en_US.UTF-8
+  export LC_ALL=en_US.UTF-8
+
+  # Step 6: Stop PostgreSQL and clean up
+  echo "# Stopping PostgreSQL for reinstall"
+  run ../home.admin/config.scripts/bonus.postgresql.sh off
+  [ "$status" -eq 0 ]
+
+  # Clean up cluster
+  sudo pg_dropcluster 15 main --stop || true
+  sudo rm -rf /mnt/hdd/app-data/postgresql*
+
+  # Step 7: Reinstall PostgreSQL with en_US locale
+  echo "# Reinstalling PostgreSQL with en_US locale"
+  run ../home.admin/config.scripts/bonus.postgresql.sh on
+  [ "$status" -eq 0 ]
+
+  # Verify PostgreSQL is running
+  run pg_lsclusters
+  [ "$status" -eq 0 ]
+
+  # Step 8: Restore the database from backup
+  echo "# Restoring database from backup"
+  sudo -u postgres psql -c "CREATE DATABASE testdb_locale TEMPLATE template0 LC_CTYPE 'en_US.UTF-8' LC_COLLATE 'en_US.UTF-8' ENCODING 'UTF8';"
+  sudo -u postgres psql -c "CREATE USER testuser_locale WITH ENCRYPTED PASSWORD 'raspiblitz';"
+  sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE testdb_locale TO testuser_locale;"
+
+  # Restore data
+  sudo -u postgres psql testdb_locale < /tmp/pg_locale_test/testdb_backup.sql
+
+  # Step 9: Verify data integrity after locale change
+  echo "# Verifying data integrity after locale change"
+  run sudo -u postgres psql testdb_locale -t -c "SELECT COUNT(*) FROM test_data;"
+  echo "$output" | grep -q "2"
+  [ "$?" -eq 0 ]
+
+  # Verify specific data
+  run sudo -u postgres psql testdb_locale -t -c "SELECT name FROM test_data WHERE amount = 100.50;"
+  echo "$output" | grep -q "Test £100.50"
+  [ "$?" -eq 0 ]
+
+  # Check new database locale settings
+  new_db_locale=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_COLLATE;" | xargs)
+  echo "# New database locale: $new_db_locale"
+  [[ "$new_db_locale" == *"en_US"* ]]
+
+  # Step 10: Test database operations work correctly
+  echo "# Testing database operations"
+  sudo -u postgres psql testdb_locale -c "INSERT INTO test_data (name, amount) VALUES ('Test \$300.25', 300.25);"
+  run sudo -u postgres psql testdb_locale -t -c "SELECT COUNT(*) FROM test_data;"
+  echo "$output" | grep -q "3"
+  [ "$?" -eq 0 ]
+
+  # Cleanup test files
+  sudo rm -rf /tmp/pg_locale_test
+
+  # Restore original locale if it was set
+  if [ -n "$original_locale" ]; then
+    export LANG="$original_locale"
+  fi
+  if [ -n "$original_lc_all" ]; then
+    export LC_ALL="$original_lc_all"
+  fi
+
+  echo "# Locale change test completed successfully"
+}
+
 @test "Cleanup" {
   run ../home.admin/config.scripts/bonus.postgresql.sh off
   [ "$status" -eq 0 ]

test/bonus.postgresql-locale.bats

@@ -0,0 +1,324 @@
+#!/usr/bin/env bats
+
+# Test PostgreSQL installation and database restoration across locale changes
+# This test simulates a scenario where:
+# 1. A database is created with en_GB locale
+# 2. System locale is changed to en_US
+# 3. PostgreSQL is reinstalled and database is restored
+# 4. Data integrity is verified across the locale change
+
+# Helper function to check if postgres user exists and PostgreSQL is properly set up
+check_postgres_setup() {
+  # Check if postgres user exists
+  if ! id postgres >/dev/null 2>&1; then
+    echo "# postgres user does not exist, skipping test"
+    skip "postgres user not found - PostgreSQL may not be properly installed"
+  fi
+
+  # Check if PostgreSQL service is available
+  if ! systemctl list-unit-files | grep -q postgresql; then
+    echo "# PostgreSQL service not available, skipping test"
+    skip "PostgreSQL service not available"
+  fi
+}
+
+# Helper function to safely set up locale
+setup_locale() {
+  local locale_name=$1
+  echo "# Setting up $locale_name locale"
+
+  # Enable locale in locale.gen
+  sudo sed -i "/^#${locale_name} UTF-8/s/^#//" /etc/locale.gen 2>/dev/null || true
+  sudo sed -i "/^# ${locale_name} UTF-8/s/^# //" /etc/locale.gen 2>/dev/null || true
+
+  # Generate locales
+  sudo locale-gen $locale_name 2>/dev/null || {
+    echo "# Warning: Could not generate $locale_name locale"
+    return 1
+  }
+
+  # Try to set the locale, but don't fail if it doesn't work
+  export LANG=$locale_name 2>/dev/null || true
+  export LC_ALL=$locale_name 2>/dev/null || {
+    echo "# Warning: Could not set LC_ALL to $locale_name"
+    unset LC_ALL
+  }
+
+  return 0
+}
+
+@test "Setup: Save current locale settings" {
+  # Save current system locale for restoration later
+  locale > /tmp/original_locale.txt
+  echo "# Current locale saved"
+}
+
+@test "Phase 1: Create database with en_GB locale" {
+  # Ensure en_GB locale is available
+  setup_locale "en_GB.UTF-8"
+  
+  # Install PostgreSQL
+  echo "# Installing PostgreSQL with en_GB locale"
+  run ./home.admin/config.scripts/bonus.postgresql.sh on
+  if [ "$status" -ne 0 ]; then
+    echo "# PostgreSQL installation failed with status: $status"
+    echo "# Output: $output"
+    skip "PostgreSQL installation failed"
+  fi
+
+  # Verify PostgreSQL is running
+  run pg_lsclusters
+  if [ "$status" -ne 0 ]; then
+    echo "# pg_lsclusters failed, PostgreSQL may not be properly installed"
+    skip "PostgreSQL not properly installed"
+  fi
+  echo "$output" | grep -q "online" || skip "PostgreSQL cluster not online"
+}
+
+@test "Phase 2: Create test database and data with en_GB locale" {
+  # Check postgres setup before proceeding
+  check_postgres_setup
+
+  # Create database with explicit en_GB locale
+  echo "# Creating test database with en_GB locale"
+  sudo -u postgres psql -c "CREATE DATABASE testdb_locale TEMPLATE template0 LC_CTYPE 'en_GB.UTF-8' LC_COLLATE 'en_GB.UTF-8' ENCODING 'UTF8';"
+  sudo -u postgres psql -c "CREATE USER testuser_locale WITH ENCRYPTED PASSWORD 'raspiblitz';"
+  sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE testdb_locale TO testuser_locale;"
+  
+  # Create test table and insert locale-specific data
+  sudo -u postgres psql testdb_locale -c "CREATE TABLE test_data (
+    id SERIAL PRIMARY KEY, 
+    name TEXT, 
+    amount DECIMAL(10,2),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    description TEXT
+  );"
+  
+  # Insert test data with British currency symbols and formatting
+  sudo -u postgres psql testdb_locale -c "INSERT INTO test_data (name, amount, description) VALUES 
+    ('British Pound Test', 100.50, 'Amount: £100.50'),
+    ('Euro Test', 200.75, 'Amount: €200.75'),
+    ('Date Test', 300.25, 'Created on $(date +%d/%m/%Y)');"
+  
+  # Verify database creation
+  run sudo -u postgres psql -l
+  echo "$output" | grep -q "testdb_locale"
+  [ "$?" -eq 0 ]
+  
+  # Verify locale settings
+  db_collate=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_COLLATE;" | xargs)
+  db_ctype=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_CTYPE;" | xargs)
+  echo "# Database LC_COLLATE: $db_collate"
+  echo "# Database LC_CTYPE: $db_ctype"
+  [[ "$db_collate" == *"en_GB"* ]]
+  [[ "$db_ctype" == *"en_GB"* ]]
+}
+
+@test "Phase 3: Backup database before locale change" {
+  # Check postgres setup before proceeding
+  check_postgres_setup
+
+  # Create backup directory
+  sudo mkdir -p /tmp/pg_locale_test
+  if id postgres >/dev/null 2>&1; then
+    sudo chown postgres:postgres /tmp/pg_locale_test
+  else
+    sudo chown admin:admin /tmp/pg_locale_test
+  fi
+  
+  # Create database backup
+  echo "# Creating backup of test database"
+  sudo -u postgres pg_dump testdb_locale > /tmp/pg_locale_test/testdb_backup.sql
+  [ -f /tmp/pg_locale_test/testdb_backup.sql ]
+  
+  # Verify backup contains our test data
+  grep -q "British Pound Test" /tmp/pg_locale_test/testdb_backup.sql
+  [ "$?" -eq 0 ]
+  grep -q "£100.50" /tmp/pg_locale_test/testdb_backup.sql
+  [ "$?" -eq 0 ]
+  
+  # Also create a custom format backup for testing
+  sudo -u postgres pg_dump -Fc testdb_locale > /tmp/pg_locale_test/testdb_backup.dump
+  [ -f /tmp/pg_locale_test/testdb_backup.dump ]
+  
+  echo "# Backup created successfully"
+}
+
+@test "Phase 4: Change system locale to en_US" {
+  # Ensure en_US locale is available
+  setup_locale "en_US.UTF-8"
+  
+  # Update system default locale
+  echo -e "LANG=en_US.UTF-8\nLANGUAGE=en_US.UTF-8\nLC_ALL=en_US.UTF-8" | sudo tee /etc/default/locale > /dev/null
+  
+  # Verify locale change
+  current_lang=$(locale | grep LANG= | cut -d= -f2 | tr -d '"')
+  echo "# Current LANG: $current_lang"
+  [[ "$current_lang" == *"en_US"* ]]
+}
+
+@test "Phase 5: Reinstall PostgreSQL with new locale" {
+  # Stop and remove PostgreSQL
+  echo "# Stopping PostgreSQL for reinstall"
+  run ./home.admin/config.scripts/bonus.postgresql.sh off
+  if [ "$status" -ne 0 ]; then
+    echo "# Warning: PostgreSQL stop failed with status: $status"
+    echo "# Output: $output"
+    # Continue anyway as the service might not be running
+  fi
+  
+  # Clean up any remaining clusters
+  sudo pg_dropcluster 15 main --stop || true
+  sudo pg_dropcluster 13 main --stop || true
+  sudo rm -rf /mnt/hdd/app-data/postgresql*
+  
+  # Reinstall PostgreSQL with en_US locale
+  echo "# Reinstalling PostgreSQL with en_US locale"
+  setup_locale "en_US.UTF-8"
+  run ./home.admin/config.scripts/bonus.postgresql.sh on
+  if [ "$status" -ne 0 ]; then
+    echo "# PostgreSQL reinstallation failed with status: $status"
+    echo "# Output: $output"
+    skip "PostgreSQL reinstallation failed"
+  fi
+
+  # Verify PostgreSQL is running
+  run pg_lsclusters
+  if [ "$status" -ne 0 ]; then
+    echo "# pg_lsclusters failed after reinstall"
+    skip "PostgreSQL not properly reinstalled"
+  fi
+  echo "$output" | grep -q "online" || skip "PostgreSQL cluster not online after reinstall"
+  
+  # Verify new cluster uses en_US locale
+  cluster_collate=$(sudo -u postgres psql -t -c "SHOW LC_COLLATE;" | xargs)
+  echo "# New cluster LC_COLLATE: $cluster_collate"
+  [[ "$cluster_collate" == *"en_US"* ]]
+}
+
+@test "Phase 6: Restore database with locale compatibility" {
+  # Check postgres setup before proceeding
+  check_postgres_setup
+
+  # Create new database with en_US locale
+  echo "# Creating new database with en_US locale"
+  sudo -u postgres psql -c "CREATE DATABASE testdb_locale TEMPLATE template0 LC_CTYPE 'en_US.UTF-8' LC_COLLATE 'en_US.UTF-8' ENCODING 'UTF8';"
+  sudo -u postgres psql -c "CREATE USER testuser_locale WITH ENCRYPTED PASSWORD 'raspiblitz';"
+  sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE testdb_locale TO testuser_locale;"
+  
+  # Restore data from backup
+  echo "# Restoring database from SQL backup"
+  sudo -u postgres psql testdb_locale < /tmp/pg_locale_test/testdb_backup.sql
+  
+  # Verify database locale settings
+  new_db_collate=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_COLLATE;" | xargs)
+  new_db_ctype=$(sudo -u postgres psql testdb_locale -t -c "SHOW LC_CTYPE;" | xargs)
+  echo "# Restored database LC_COLLATE: $new_db_collate"
+  echo "# Restored database LC_CTYPE: $new_db_ctype"
+  [[ "$new_db_collate" == *"en_US"* ]]
+  [[ "$new_db_ctype" == *"en_US"* ]]
+}
+
+@test "Phase 7: Verify data integrity after locale change" {
+  # Check postgres setup before proceeding
+  check_postgres_setup
+
+  # Check that all records were restored
+  echo "# Verifying data integrity after locale change"
+  record_count=$(sudo -u postgres psql testdb_locale -t -c "SELECT COUNT(*) FROM test_data;" 2>/dev/null | xargs)
+  echo "# Record count: $record_count"
+
+  # Check if record_count is a valid number
+  if [[ ! "$record_count" =~ ^[0-9]+$ ]]; then
+    echo "# Error: Could not get valid record count. Got: '$record_count'"
+    skip "Database query failed or returned invalid result"
+  fi
+
+  [ "$record_count" -eq 3 ]
+  
+  # Verify specific data with currency symbols
+  run sudo -u postgres psql testdb_locale -t -c "SELECT name FROM test_data WHERE amount = 100.50;"
+  echo "$output" | grep -q "British Pound Test"
+  [ "$?" -eq 0 ]
+  
+  run sudo -u postgres psql testdb_locale -t -c "SELECT description FROM test_data WHERE name = 'British Pound Test';"
+  echo "$output" | grep -q "£100.50"
+  [ "$?" -eq 0 ]
+  
+  # Verify Euro symbol is preserved
+  run sudo -u postgres psql testdb_locale -t -c "SELECT description FROM test_data WHERE name = 'Euro Test';"
+  echo "$output" | grep -q "€200.75"
+  [ "$?" -eq 0 ]
+  
+  echo "# Data integrity verified successfully"
+}
+
+@test "Phase 8: Test database operations with new locale" {
+  # Check postgres setup before proceeding
+  check_postgres_setup
+
+  # Test inserting new data with US formatting
+  echo "# Testing database operations with en_US locale"
+  sudo -u postgres psql testdb_locale -c "INSERT INTO test_data (name, amount, description) VALUES
+    ('US Dollar Test', 400.99, 'Amount: \$400.99'),
+    ('Date Test US', 500.00, 'Created on $(date +%m/%d/%Y)');"
+  
+  # Verify new records
+  record_count=$(sudo -u postgres psql testdb_locale -t -c "SELECT COUNT(*) FROM test_data;" 2>/dev/null | xargs)
+  echo "# Total record count: $record_count"
+
+  # Check if record_count is a valid number
+  if [[ ! "$record_count" =~ ^[0-9]+$ ]]; then
+    echo "# Error: Could not get valid record count. Got: '$record_count'"
+    skip "Database query failed or returned invalid result"
+  fi
+
+  [ "$record_count" -eq 5 ]
+  
+  # Test sorting with different locale (should work with both old and new data)
+  run sudo -u postgres psql testdb_locale -t -c "SELECT name FROM test_data ORDER BY name;"
+  [ "$?" -eq 0 ]
+  
+  # Test numeric operations
+  total_amount=$(sudo -u postgres psql testdb_locale -t -c "SELECT SUM(amount) FROM test_data;" 2>/dev/null | xargs)
+  echo "# Total amount: $total_amount"
+
+  # Check if total_amount is a valid number
+  if [[ ! "$total_amount" =~ ^[0-9]+\.[0-9]+$ ]]; then
+    echo "# Error: Could not get valid total amount. Got: '$total_amount'"
+    skip "Database sum query failed or returned invalid result"
+  fi
+
+  # Should be 100.50 + 200.75 + 300.25 + 400.99 + 500.00 = 1501.49
+  [[ "$total_amount" == "1501.49" ]]
+  
+  echo "# Database operations test completed successfully"
+}
+
+@test "Cleanup: Remove test data and restore locale" {
+  # Clean up test files
+  sudo rm -rf /tmp/pg_locale_test
+  
+  # Stop PostgreSQL
+  run ./home.admin/config.scripts/bonus.postgresql.sh off
+  if [ "$status" -ne 0 ]; then
+    echo "# Warning: PostgreSQL cleanup failed with status: $status"
+    echo "# Output: $output"
+    # Continue with cleanup anyway
+  fi
+  
+  # Clean up clusters
+  sudo pg_dropcluster 15 main --stop || true
+  sudo pg_dropcluster 13 main --stop || true
+  sudo rm -rf /mnt/hdd/app-data/postgresql*
+  
+  # Restore original locale if backup exists
+  if [ -f /tmp/original_locale.txt ]; then
+    echo "# Restoring original locale settings"
+    # Note: Full locale restoration would require a reboot in practice
+    # For testing purposes, we just clean up our changes
+    sudo rm -f /tmp/original_locale.txt
+  fi
+  
+  echo "# Cleanup completed successfully"
+}

test/bonus.postgresql-restore-locale.bats

@@ -0,0 +1,232 @@
+#!/usr/bin/env bats
+
+# Test PostgreSQL restore functionality across locale changes
+# This test uses the built-in backup/restore functionality of bonus.postgresql.sh
+# to test locale compatibility when restoring databases
+
+@test "Setup: Prepare en_GB environment and install PostgreSQL" {
+  # Ensure both locales are available
+  sudo sed -i '/^#en_GB.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+  sudo sed -i '/^# en_GB.UTF-8 UTF-8/s/^# //' /etc/locale.gen
+  sudo sed -i '/^#en_US.UTF-8 UTF-8/s/^#//' /etc/locale.gen
+  sudo sed -i '/^# en_US.UTF-8 UTF-8/s/^# //' /etc/locale.gen
+  sudo locale-gen
+  
+  # Set to en_GB initially
+  export LANG=en_GB.UTF-8
+  export LC_ALL=en_GB.UTF-8
+  
+  # Install PostgreSQL
+  run ../home.admin/config.scripts/bonus.postgresql.sh on
+  [ "$status" -eq 0 ]
+  
+  # Verify installation
+  run pg_lsclusters
+  [ "$status" -eq 0 ]
+  echo "$output" | grep -q "online"
+}
+
+@test "Create test database with en_GB locale and sample data" {
+  # Create database with en_GB locale
+  sudo -u postgres psql -c "CREATE DATABASE testdb_restore TEMPLATE template0 LC_CTYPE 'en_GB.UTF-8' LC_COLLATE 'en_GB.UTF-8' ENCODING 'UTF8';"
+  sudo -u postgres psql -c "CREATE USER testuser_restore WITH ENCRYPTED PASSWORD 'testpass123';"
+  sudo -u postgres psql -c "GRANT ALL PRIVILEGES ON DATABASE testdb_restore TO testuser_restore;"
+  
+  # Create sample data with locale-specific content
+  sudo -u postgres psql testdb_restore -c "
+    CREATE TABLE products (
+      id SERIAL PRIMARY KEY,
+      name VARCHAR(100),
+      price DECIMAL(10,2),
+      description TEXT,
+      created_date DATE DEFAULT CURRENT_DATE
+    );
+    
+    INSERT INTO products (name, price, description) VALUES 
+      ('British Tea', 4.50, 'Premium Earl Grey - £4.50'),
+      ('Scottish Whisky', 45.99, 'Single Malt - £45.99'),
+      ('Welsh Cheese', 8.75, 'Caerphilly cheese - £8.75'),
+      ('Irish Coffee', 6.25, 'Traditional recipe - £6.25');
+    
+    CREATE TABLE orders (
+      id SERIAL PRIMARY KEY,
+      product_id INTEGER REFERENCES products(id),
+      quantity INTEGER,
+      order_date TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+      customer_notes TEXT
+    );
+    
+    INSERT INTO orders (product_id, quantity, customer_notes) VALUES 
+      (1, 2, 'Delivery to London postcode SW1A 1AA'),
+      (2, 1, 'Gift wrapping requested'),
+      (3, 3, 'Please check expiry date'),
+      (4, 1, 'Extra hot please');
+  "
+  
+  # Verify data was created
+  record_count=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM products;" | xargs)
+  [ "$record_count" -eq 4 ]
+  
+  order_count=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM orders;" | xargs)
+  [ "$order_count" -eq 4 ]
+}
+
+@test "Create backup using PostgreSQL script" {
+  # Use the built-in backup functionality
+  echo "# Creating backup using bonus.postgresql.sh"
+  run ../home.admin/config.scripts/bonus.postgresql.sh backup testdb_restore
+  [ "$status" -eq 0 ]
+  
+  # Verify backup was created
+  backup_dir="/mnt/hdd/app-data/backup/testdb_restore"
+  [ -d "$backup_dir" ]
+  
+  # Find the backup file (it has a timestamp in the name)
+  backup_file=$(ls -t $backup_dir/*.sql | head -n1)
+  [ -f "$backup_file" ]
+  
+  # Verify backup contains our data
+  grep -q "British Tea" "$backup_file"
+  grep -q "£4.50" "$backup_file"
+  grep -q "SW1A 1AA" "$backup_file"
+  
+  echo "# Backup created: $backup_file"
+}
+
+@test "Change system locale to en_US and reinstall PostgreSQL" {
+  # Change to en_US locale
+  export LANG=en_US.UTF-8
+  export LC_ALL=en_US.UTF-8
+  echo -e "LANG=en_US.UTF-8\nLANGUAGE=en_US.UTF-8\nLC_ALL=en_US.UTF-8" | sudo tee /etc/default/locale > /dev/null
+  
+  # Stop PostgreSQL
+  run ../home.admin/config.scripts/bonus.postgresql.sh off
+  [ "$status" -eq 0 ]
+  
+  # Clean up
+  sudo pg_dropcluster 15 main --stop || true
+  sudo rm -rf /mnt/hdd/app-data/postgresql*
+  
+  # Reinstall with en_US locale
+  run ../home.admin/config.scripts/bonus.postgresql.sh on
+  [ "$status" -eq 0 ]
+  
+  # Verify new installation uses en_US
+  cluster_locale=$(sudo -u postgres psql -t -c "SHOW LC_COLLATE;" | xargs)
+  echo "# New cluster locale: $cluster_locale"
+  [[ "$cluster_locale" == *"en_US"* ]]
+}
+
+@test "Restore database using PostgreSQL script" {
+  # Use the built-in restore functionality
+  echo "# Restoring database using bonus.postgresql.sh"
+  run ../home.admin/config.scripts/bonus.postgresql.sh restore testdb_restore testuser_restore testpass123
+  [ "$status" -eq 0 ]
+  
+  # Verify database was restored
+  run sudo -u postgres psql -l
+  echo "$output" | grep -q "testdb_restore"
+  
+  # Verify user was created
+  run sudo -u postgres psql -c "\du"
+  echo "$output" | grep -q "testuser_restore"
+}
+
+@test "Verify data integrity after restore with locale change" {
+  # Check that all products were restored
+  product_count=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM products;" | xargs)
+  echo "# Product count after restore: $product_count"
+  [ "$product_count" -eq 4 ]
+  
+  # Check that all orders were restored
+  order_count=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM orders;" | xargs)
+  echo "# Order count after restore: $order_count"
+  [ "$order_count" -eq 4 ]
+  
+  # Verify specific data with currency symbols
+  run sudo -u postgres psql testdb_restore -t -c "SELECT description FROM products WHERE name = 'British Tea';"
+  echo "$output" | grep -q "£4.50"
+  
+  # Verify postcode data (UK format)
+  run sudo -u postgres psql testdb_restore -t -c "SELECT customer_notes FROM orders WHERE id = 1;"
+  echo "$output" | grep -q "SW1A 1AA"
+  
+  # Test that we can still query and sort data correctly
+  run sudo -u postgres psql testdb_restore -t -c "SELECT name FROM products ORDER BY price DESC LIMIT 1;"
+  echo "$output" | grep -q "Scottish Whisky"
+  
+  # Test numeric operations work correctly
+  total_value=$(sudo -u postgres psql testdb_restore -t -c "SELECT SUM(price) FROM products;" | xargs)
+  echo "# Total product value: $total_value"
+  # Should be 4.50 + 45.99 + 8.75 + 6.25 = 65.49
+  [[ "$total_value" == "65.49" ]]
+}
+
+@test "Test database operations with mixed locale data" {
+  # Insert new data with US formatting
+  sudo -u postgres psql testdb_restore -c "
+    INSERT INTO products (name, price, description) VALUES 
+      ('American Coffee', 3.99, 'Regular blend - \$3.99'),
+      ('New York Bagel', 2.50, 'Fresh baked - \$2.50');
+    
+    INSERT INTO orders (product_id, quantity, customer_notes) VALUES 
+      (5, 1, 'Delivery to ZIP code 10001'),
+      (6, 2, 'Extra cream cheese');
+  "
+  
+  # Verify mixed data works correctly
+  total_products=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM products;" | xargs)
+  [ "$total_products" -eq 6 ]
+  
+  total_orders=$(sudo -u postgres psql testdb_restore -t -c "SELECT COUNT(*) FROM orders;" | xargs)
+  [ "$total_orders" -eq 6 ]
+  
+  # Test that both UK and US currency symbols are preserved
+  run sudo -u postgres psql testdb_restore -t -c "SELECT description FROM products WHERE price < 5.00;"
+  echo "$output" | grep -q "£4.50"  # UK pound
+  echo "$output" | grep -q "\$3.99"  # US dollar
+  echo "$output" | grep -q "\$2.50"  # US dollar
+  
+  # Test sorting works with mixed locale data
+  run sudo -u postgres psql testdb_restore -t -c "SELECT name FROM products ORDER BY name;"
+  [ "$?" -eq 0 ]
+  
+  echo "# Mixed locale data test completed successfully"
+}
+
+@test "Test user authentication and permissions" {
+  # Test that the restored user can connect and access data
+  run sudo -u postgres psql -d testdb_restore -U testuser_restore -c "SELECT COUNT(*) FROM products;"
+  [ "$?" -eq 0 ]
+  
+  # Test that user has proper permissions
+  sudo -u postgres psql testdb_restore -c "
+    GRANT SELECT, INSERT, UPDATE, DELETE ON products TO testuser_restore;
+    GRANT SELECT, INSERT, UPDATE, DELETE ON orders TO testuser_restore;
+    GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO testuser_restore;
+  "
+  
+  # Test insert permission
+  run sudo -u postgres psql -d testdb_restore -U testuser_restore -c "
+    INSERT INTO products (name, price, description) VALUES ('Test Product', 1.00, 'Test');
+  "
+  [ "$?" -eq 0 ]
+  
+  echo "# User authentication and permissions test completed"
+}
+
+@test "Cleanup: Remove test data and PostgreSQL" {
+  # Stop PostgreSQL
+  run ../home.admin/config.scripts/bonus.postgresql.sh off
+  [ "$status" -eq 0 ]
+  
+  # Clean up clusters
+  sudo pg_dropcluster 15 main --stop || true
+  sudo pg_dropcluster 13 main --stop || true
+  sudo rm -rf /mnt/hdd/app-data/postgresql*
+  
+  # Clean up backup directory
+  sudo rm -rf /mnt/hdd/app-data/backup/testdb_restore
+  
+  echo "# Cleanup completed successfully"
+}