From 76e85b8fbb402168b45565ada9b26461c4982649 Mon Sep 17 00:00:00 2001
From: Luke Holder <luke@pixelandtonic.com>
Date: Fri, 21 Jul 2023 11:07:03 +0800
Subject: [PATCH] Keep estimated addresses

---
 src/console/controllers/UpgradeController.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/console/controllers/UpgradeController.php b/src/console/controllers/UpgradeController.php
index ef03d856a3..e85949001d 100644
--- a/src/console/controllers/UpgradeController.php
+++ b/src/console/controllers/UpgradeController.php
@@ -13,7 +13,6 @@
 use craft\commerce\db\Table;
 use craft\commerce\elements\conditions\addresses\PostalCodeFormulaConditionRule;
 use craft\commerce\Plugin;
-use craft\commerce\records\Customer;
 use craft\commerce\records\Store;
 use craft\db\Query;
 use craft\db\Table as CraftTable;
@@ -37,7 +36,6 @@
 use craft\models\FieldLayout;
 use craft\validators\HandleValidator;
 use Throwable;
-use yii\base\InvalidArgumentException;
 use yii\console\ExitCode;
 use yii\db\Exception;
 use yii\db\Expression;
@@ -881,6 +879,21 @@ private function _migrateAddresses()
   FROM $ordersTable AS o2
   WHERE o2.v3shippingAddressId = a.id
 )
+AND NOT EXISTS (
+  SELECT 1
+  FROM $ordersTable AS o2
+  WHERE o2.v3estimatedBillingAddressId = a.id
+)
+AND NOT EXISTS (
+  SELECT 1
+  FROM $ordersTable AS o2
+  WHERE o2.v3shippingAddressId = a.id
+)
+AND NOT EXISTS (
+  SELECT 1
+  FROM $ordersTable AS o2
+  WHERE o2.v3estimatedShippingAddressId = a.id
+)
 AND NOT EXISTS (
   SELECT 1
   FROM $customersAddressesTable AS ca
@@ -888,7 +901,6 @@ private function _migrateAddresses()
 );
 SQL;
 
-        $deletableAddresses = Craft::$app->getDb()->createCommand($sql);
         $deletableAddressesIds = Craft::$app->getDb()->createCommand($sql)->queryColumn();
         $deleted = Craft::$app->getDb()->createCommand()->delete($addressesTable, ['id' => $deletableAddressesIds])->execute();