From 4061be7fc642bc1aae8bc7b98582e46bf7c67648 Mon Sep 17 00:00:00 2001
From: James Rouzier <jrouzier@inverse.ca>
Date: Mon, 5 Jul 2021 11:13:21 -0400
Subject: [PATCH] Finish renaming X.Y.Z.sql -> X.Y.sql

---
 Makefile                                              | 2 +-
 addons/dev-helpers/bin/generator-data-access-layer.pl | 2 +-
 t/db/schema.t                                         | 4 ++--
 t/test_apply_schema.sh                                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index aa35d1f576cc..eea96af8f23a 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ translation:
 .PHONY: mysql-schema
 
 mysql-schema:
-	ln -f -s /usr/local/pf/db/pf-schema-X.Y.Z.sql /usr/local/pf/db/pf-schema.sql;
+	ln -f -s /usr/local/pf/db/pf-schema-X.Y.sql /usr/local/pf/db/pf-schema.sql;
 
 .PHONY: chown_pf
 
diff --git a/addons/dev-helpers/bin/generator-data-access-layer.pl b/addons/dev-helpers/bin/generator-data-access-layer.pl
index e4f33d39d05d..6b7aff16d7e3 100644
--- a/addons/dev-helpers/bin/generator-data-access-layer.pl
+++ b/addons/dev-helpers/bin/generator-data-access-layer.pl
@@ -23,7 +23,7 @@ =head1 DESCRIPTION
 our %OPTIONS = (
     dbpass => 'packet',
     dbuser => 'pf_smoke_tester',
-    schema => "$PF_DIR/db/pf-schema-X.Y.Z.sql",
+    schema => "$PF_DIR/db/pf-schema-X.Y.sql",
 );
 
 GetOptions(\%OPTIONS, 'dbpass=s', 'dbuser=s', 'schema=s');
diff --git a/t/db/schema.t b/t/db/schema.t
index 8a1e5e1c4090..a20dbfc13573 100755
--- a/t/db/schema.t
+++ b/t/db/schema.t
@@ -38,8 +38,8 @@ use Test::More tests => 2;                      # last test to print
 use Test::NoWarnings;
 
 my $DB_NAME = 'PF_SCHEMA_TEST';
-my $test_schema = "$install_dir/db/pf-schema-X.Y.Z.sql";
-my $upgrade_schema = "$install_dir/db/upgrade-X.X.X-X.Y.Z.sql";
+my $test_schema = "$install_dir/db/pf-schema-X.Y.sql";
+my $upgrade_schema = "$install_dir/db/upgrade-X.X-X.Y.sql";
 
 SKIP: {
     skip ('No db pass set',1) unless exists $ENV{PF_TEST_DB_PASS};
diff --git a/t/test_apply_schema.sh b/t/test_apply_schema.sh
index c369b97087de..c0d087ae98e9 100755
--- a/t/test_apply_schema.sh
+++ b/t/test_apply_schema.sh
@@ -26,10 +26,10 @@ MYSQL="mysql -upf_smoke_tester -ppacket -h$HOST"
 
 MYSQLDUMP="mysqldump -upf_smoke_tester -h$HOST --no-data -a --skip-comments --routines -ppacket"
 
-CURRENT_SCHEMA="$PF_DIR/db/pf-schema-X.Y.Z.sql"
+CURRENT_SCHEMA="$PF_DIR/db/pf-schema-X.Y.sql"
 
 if [ -e "$CURRENT_SCHEMA" ]; then
-    UPGRADE_SCRIPT="$PF_DIR/db/upgrade-X.X.X-X.Y.Z.sql"
+    UPGRADE_SCRIPT="$PF_DIR/db/upgrade-X.X-X.Y.sql"
     LAST_SCHEMA=$(ls $PF_DIR/db/pf-schema-[0-9]*sql | sort --version-sort -r | head -1)
 else
     CURRENT_SCHEMA="$PF_DIR/db/pf-schema.sql"