primary/replica in a definitely non-breaking way (#18106)

yiisoft · Jun 16, 2020 · eb956e9 · eb956e9
1 parent 4c416c7
commit eb956e9
Show file tree

Hide file tree

Showing 27 changed files with 212 additions and 214 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -18,19 +18,19 @@ Yii Framework 2 Change Log
 - Bug #18096: Fix InlineValidator with anonymous inline function not working well from EachValidator (trombipeti)
 - Enh #18083: Add `Controller::$request` and `$response` (brandonkelly)
 - Enh #18102: Use “primary”/“replica” terminology instead of “master”/“slave” (brandonkelly)
-  - Added `yii\db\Connection::$enableReplicas` and deprecated `$enableSlaves` via magic methods.
-  - Added `yii\db\Connection::$replicas` and deprecated `$slaves` via magic methods.
-  - Added `yii\db\Connection::$replicaConfig` and deprecated `$slaveConfig` via magic methods.
-  - Added `yii\db\Connection::$primaries` and deprecated `$masters` via magic methods.
-  - Added `yii\db\Connection::$primaryConfig` and deprecated `$masterConfig` via magic methods.
-  - Added `yii\db\Connection::$shufflePrimaries` and deprecated `$shuffleMasters` via magic methods.
+  - Added `yii\db\Connection::$enableReplicas` via magic methods and deprecated `$enableSlaves`.
+  - Added `yii\db\Connection::$replicas` via magic methods and deprecated `$slaves`.
+  - Added `yii\db\Connection::$replicaConfig` via magic methods and deprecated `$slaveConfig`.
+  - Added `yii\db\Connection::$primaries` via magic methods and deprecated `$masters`.
+  - Added `yii\db\Connection::$primaryConfig` via magic methods and deprecated `$masterConfig`.
+  - Added `yii\db\Connection::$shufflePrimaries` via magic methods and deprecated `$shuffleMasters`.
   - Added `yii\db\Connection::getReplicaPdo()` and deprecated `getSlavePdo()`.
   - Added `yii\db\Connection::getPrimaryPdo()` and deprecated `getMasterPdo()`.
   - Added `yii\db\Connection::getReplica()` and deprecated `getSlave()`.
   - Added `yii\db\Connection::getPrimary()` and deprecated `getMaster()`.
   - Added `yii\db\Connection::usePrimary()` and deprecated `useMaster()`.
-  - Added `yii\validators\ExistValidator::$forcePrimaryDb` and deprecated `$forceMasterDb` via magic methods.
-  - Added `yii\validators\UniqueValidator::$forcePrimaryDb` and deprecated `$forceMasterDb` via magic methods.
+  - Added `yii\validators\ExistValidator::$forcePrimaryDb` via magic methods and deprecated `$forceMasterDb`.
+  - Added `yii\validators\UniqueValidator::$forcePrimaryDb` via magic methods and deprecated `$forceMasterDb`.
 - Bug #18101: Fix behavior of OUTPUT INSERTED.* for SQL Server query: "insert default values"; correct MSSQL unit tests; turn off profiling echo message in migration test (darkdef)
 - Bug #18105: Fix for old trigger in RBAC migration with/without prefixTable (darkdef)
 

diff --git a/framework/db/Command.php b/framework/db/Command.php
@@ -252,9 +252,9 @@ public function prepare($forRead = null)
             $forRead = false;
         }
         if ($forRead || $forRead === null && $this->db->getSchema()->isReadQuery($sql)) {
-            $pdo = $this->db->getReplicaPdo();
+            $pdo = $this->db->getSlavePdo();
         } else {
-            $pdo = $this->db->getPrimaryPdo();
+            $pdo = $this->db->getMasterPdo();
         }
 
         try {