Merge pull request #1324 from spryker-shop/bugfix/sc-13227/master-mul…

…ti-db-does-not-work-with-dynamic-store Auto-merge based on green CI result.
spryker-shop · Jul 6, 2023 · 2069a05 · 2069a05
2 parents 0cdc28e + 88aaf32
commit 2069a05
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 19 deletions.
diff --git a/.git.docker b/.git.docker
@@ -1 +1 @@
-b5a63eac724e02fc4529b1b98dbf67e9d8b7c8ae
+437fdadf19b3172998743404f0c98eacfae4f213
diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -344,7 +344,7 @@
 
 $paasServices = json_decode(getenv('SPRYKER_PAAS_SERVICES') ?: '[]', true);
 if (!empty($paasServices['databases'])) {
-    $databasesConfig = $paasServices['databases'][APPLICATION_CODE_BUCKET] ?? $paasServices['databases']['_default'];
+    $databasesConfig = $paasServices['databases'][APPLICATION_STORE] ?? $paasServices['databases']['_default'];
     $config[PropelConstants::ZED_DB_HOST] = $databasesConfig['host'];
     $config[PropelConstants::ZED_DB_PORT] = $databasesConfig['port'];
     $config[PropelConstants::ZED_DB_USERNAME] = $databasesConfig['username'];

diff --git a/config/Shared/stores.php b/config/Shared/stores.php
@@ -93,7 +93,7 @@
         }, $activeStores);
     }
 
-    return $isMultiDbEnabled ? [APPLICATION_CODE_BUCKET => $stores[APPLICATION_CODE_BUCKET]] : $stores;
+    return $isMultiDbEnabled ? [APPLICATION_STORE => $stores[APPLICATION_STORE]] : $stores;
 }
 
 $stores['DE'] = [

diff --git a/data/import/common/AT/store.csv b/data/import/common/AT/store.csv
@@ -0,0 +1,2 @@
+name
+AT
diff --git a/data/import/common/DE/store.csv b/data/import/common/DE/store.csv
@@ -0,0 +1,2 @@
+name
+DE
diff --git a/data/import/local/full_AT.yml b/data/import/local/full_AT.yml
@@ -4,9 +4,17 @@ version: 0
 actions:
     #1. Commerce Setup data import
     - data_entity: store
-    # Cannot have a source because we use store.php
+      source: data/import/common/AT/store.csv
     - data_entity: currency
       source: data/import/common/common/currency.csv
+    - data_entity: currency-store
+      source: data/import/common/AT/currency_store.csv
+    - data_entity: country-store
+      source: data/import/common/AT/country_store.csv
+    - data_entity: locale-store
+      source: data/import/common/AT/locale_store.csv
+    - data_entity: default-locale-store
+      source: data/import/common/AT/default_locale_store.csv
     - data_entity: order-source
       source: data/import/common/common/order_source.csv
     - data_entity: customer

diff --git a/data/import/local/full_DE.yml b/data/import/local/full_DE.yml
@@ -4,9 +4,17 @@ version: 0
 actions:
     #1. Commerce Setup data import
     - data_entity: store
-    # Cannot have a source because we use store.php
+      source: data/import/common/DE/store.csv
     - data_entity: currency
       source: data/import/common/common/currency.csv
+    - data_entity: currency-store
+      source: data/import/common/DE/currency_store.csv
+    - data_entity: country-store
+      source: data/import/common/DE/country_store.csv
+    - data_entity: locale-store
+      source: data/import/common/DE/locale_store.csv
+    - data_entity: default-locale-store
+      source: data/import/common/DE/default_locale_store.csv
     - data_entity: order-source
       source: data/import/common/common/order_source.csv
     - data_entity: customer

diff --git a/data/import/production/full_AT.yml b/data/import/production/full_AT.yml
@@ -4,9 +4,17 @@ version: 0
 actions:
     #1. Commerce Setup data import
     - data_entity: store
-    # Cannot have a source because we use store.php
+      source: data/import/common/AT/store.csv
     - data_entity: currency
       source: data/import/common/common/currency.csv
+    - data_entity: currency-store
+      source: data/import/common/AT/currency_store.csv
+    - data_entity: country-store
+      source: data/import/common/AT/country_store.csv
+    - data_entity: locale-store
+      source: data/import/common/AT/locale_store.csv
+    - data_entity: default-locale-store
+      source: data/import/common/AT/default_locale_store.csv
     - data_entity: order-source
       source: data/import/common/common/order_source.csv
     - data_entity: customer

diff --git a/data/import/production/full_DE.yml b/data/import/production/full_DE.yml
@@ -4,9 +4,17 @@ version: 0
 actions:
     #1. Commerce Setup data import
     - data_entity: store
-    # Cannot have a source because we use store.php
+      source: data/import/common/DE/store.csv
     - data_entity: currency
       source: data/import/common/common/currency.csv
+    - data_entity: currency-store
+      source: data/import/common/DE/currency_store.csv
+    - data_entity: country-store
+      source: data/import/common/DE/country_store.csv
+    - data_entity: locale-store
+      source: data/import/common/DE/locale_store.csv
+    - data_entity: default-locale-store
+      source: data/import/common/DE/default_locale_store.csv
     - data_entity: order-source
       source: data/import/common/common/order_source.csv
     - data_entity: customer