From 51a442d6c8266bf14e258cc77625b6d192f678d0 Mon Sep 17 00:00:00 2001
From: Klimov Paul <klimov.paul@gmail.com>
Date: Tue, 26 May 2015 11:53:34 +0300
Subject: [PATCH] Fixed `yii\db\ActiveRecord` does not updates attribute
 specified at `optimisticLock()` after save

---
 framework/CHANGELOG.md                  |  1 +
 framework/db/BaseActiveRecord.php       |  3 +++
 tests/data/ar/Document.php              | 17 +++++++++++++++++
 tests/data/cubrid.sql                   | 11 +++++++++++
 tests/data/mssql.sql                    | 13 +++++++++++++
 tests/data/mysql.sql                    | 11 +++++++++++
 tests/data/oci.sql                      | 13 +++++++++++++
 tests/data/postgres.sql                 | 11 ++++++++++-
 tests/data/sqlite.sql                   | 11 +++++++++++
 tests/framework/db/ActiveRecordTest.php | 17 +++++++++++++++++
 10 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 tests/data/ar/Document.php

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 6055f546cf..1fa0896147 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
 - Bug #8451: `yii\i18n\Formatter` did not allow negative unix timestamps as input for date formatting (cebe)
 - Bug #8483: sequence name in `Schema::getLastInsertId()` was not properly quoted (nineinchnick)
 - Bug #8506: Cleaning of output buffer in `Widget::run()` conflicts with `Pjax` widget which did the cleanup itself (cebe, joester89)
+- Bug #8544: Fixed `yii\db\ActiveRecord` does not updates attribute specified at `optimisticLock()` after save (klimov-paul)
 - Bug: Fixed string comparison in `BaseActiveRecord::unlink()` which may result in wrong comparison result for hash valued primary keys starting with `0e` (cebe)
 - Enh #7169: `yii\widgets\ActiveField` now uses corresponding methods for default parts rendering (klimov-paul)
 - Enh #8070: `yii\console\controllers\MessageController` now sorts created messages, even if there is no new one, while saving to PHP file (klimov-paul)
diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
index d99192a05e..a479819d9b 100644
--- a/framework/db/BaseActiveRecord.php
+++ b/framework/db/BaseActiveRecord.php
@@ -725,6 +725,9 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
         foreach ($values as $name => $value) {
             $changedAttributes[$name] = isset($this->_oldAttributes[$name]) ? $this->_oldAttributes[$name] : null;
             $this->_oldAttributes[$name] = $value;
+            if ($name === $lock) {
+                $this->$lock = $value;
+            }
         }
         $this->afterSave(false, $changedAttributes);
 
diff --git a/tests/data/ar/Document.php b/tests/data/ar/Document.php
new file mode 100644
index 0000000000..e4b7bc857a
--- /dev/null
+++ b/tests/data/ar/Document.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace yiiunit\data\ar;
+
+/**
+ * @property integer $id
+ * @property string $title
+ * @property string $content
+ * @property integer $version
+ */
+class Document extends ActiveRecord
+{
+    public function optimisticLock()
+    {
+        return 'version';
+    }
+}
\ No newline at end of file
diff --git a/tests/data/cubrid.sql b/tests/data/cubrid.sql
index 5c87d75a98..d98af69ae7 100644
--- a/tests/data/cubrid.sql
+++ b/tests/data/cubrid.sql
@@ -17,6 +17,7 @@ DROP TABLE IF EXISTS "type";
 DROP TABLE IF EXISTS "constraints";
 DROP TABLE IF EXISTS "animal";
 DROP TABLE IF EXISTS "default_pk";
+DROP TABLE IF EXISTS "document";
 DROP VIEW IF EXISTS "animal_view";
 
 CREATE TABLE "constraints"
@@ -139,6 +140,14 @@ CREATE TABLE "default_pk" (
   PRIMARY KEY ("id")
 );
 
+CREATE TABLE "document" (
+  "id" int(11) NOT NULL AUTO_INCREMENT,
+  "title" varchar(255) NOT NULL,
+  "content" string,
+  "version" int(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY ("id")
+);
+
 CREATE VIEW "animal_view" AS SELECT * FROM "animal";
 
 INSERT INTO "animal" ("type") VALUES ('yiiunit\data\ar\Cat');
@@ -181,3 +190,5 @@ INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VA
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (2, 5, 1, 15.0);
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (2, 3, 1, 8.0);
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (3, 2, 1, 40.0);
+
+INSERT INTO "document" (title, content, version) VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
diff --git a/tests/data/mssql.sql b/tests/data/mssql.sql
index 488dbd6e7e..344b39573b 100644
--- a/tests/data/mssql.sql
+++ b/tests/data/mssql.sql
@@ -10,6 +10,7 @@ IF OBJECT_ID('[dbo].[type]', 'U') IS NOT NULL DROP TABLE [dbo].[type];
 IF OBJECT_ID('[dbo].[null_values]', 'U') IS NOT NULL DROP TABLE [dbo].[null_values];
 IF OBJECT_ID('[dbo].[animal]', 'U') IS NOT NULL DROP TABLE [dbo].[animal];
 IF OBJECT_ID('[dbo].[default_pk]', 'U') IS NOT NULL DROP TABLE [dbo].[default_pk];
+IF OBJECT_ID('[dbo].[document]', 'U') IS NOT NULL DROP TABLE [dbo].[document];
 IF OBJECT_ID('[dbo].[animal_view]', 'V') IS NOT NULL DROP VIEW [dbo].[animal_view];
 
 CREATE TABLE [dbo].[profile] (
@@ -124,6 +125,16 @@ CREATE TABLE [dbo].[default_pk] (
 	) ON [PRIMARY]
 );
 
+CREATE TABLE [dbo].[document] (
+	[id] [int] IDENTITY(1,1) NOT NULL,
+	[title] [varchar](255) NOT NULL,
+	[content] [text],
+	[version] [int] NOT NULL DEFAULT 0,
+	CONSTRAINT [PK_default_pk] PRIMARY KEY CLUSTERED (
+		[id] ASC
+	) ON [PRIMARY]
+);
+
 CREATE VIEW [dbo].[animal_view] AS SELECT * FROM [dbo].[animal];
 
 INSERT INTO [dbo].[animal] (type) VALUES ('yiiunit\data\ar\Cat');
@@ -166,3 +177,5 @@ INSERT INTO [dbo].[order_item_with_null_fk] ([order_id], [item_id], [quantity],
 INSERT INTO [dbo].[order_item_with_null_fk] ([order_id], [item_id], [quantity], [subtotal]) VALUES (2, 5, 1, 15.0);
 INSERT INTO [dbo].[order_item_with_null_fk] ([order_id], [item_id], [quantity], [subtotal]) VALUES (2, 3, 1, 8.0);
 INSERT INTO [dbo].[order_item_with_null_fk] ([order_id], [item_id], [quantity], [subtotal]) VALUES (3, 2, 1, 40.0);
+
+INSERT INTO [dbo].[document] ([title], [content], [version]) VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
diff --git a/tests/data/mysql.sql b/tests/data/mysql.sql
index 2dd1cb2206..f8414b6921 100644
--- a/tests/data/mysql.sql
+++ b/tests/data/mysql.sql
@@ -17,6 +17,7 @@ DROP TABLE IF EXISTS `type` CASCADE;
 DROP TABLE IF EXISTS `constraints` CASCADE;
 DROP TABLE IF EXISTS `animal` CASCADE;
 DROP TABLE IF EXISTS `default_pk` CASCADE;
+DROP TABLE IF EXISTS `document` CASCADE;
 DROP VIEW IF EXISTS `animal_view`;
 
 CREATE TABLE `constraints`
@@ -141,6 +142,14 @@ CREATE TABLE `default_pk` (
   PRIMARY KEY (id)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+CREATE TABLE `document` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `title` VARCHAR(255) NOT NULL,
+  `content` TEXT,
+  `version` INT(11) NOT NULL DEFAULT 0,
+  PRIMARY KEY (id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 CREATE VIEW `animal_view` AS SELECT * FROM `animal`;
 
 INSERT INTO `animal` (`type`) VALUES ('yiiunit\data\ar\Cat');
@@ -184,6 +193,8 @@ INSERT INTO `order_item_with_null_fk` (order_id, item_id, quantity, subtotal) VA
 INSERT INTO `order_item_with_null_fk` (order_id, item_id, quantity, subtotal) VALUES (2, 3, 1, 8.0);
 INSERT INTO `order_item_with_null_fk` (order_id, item_id, quantity, subtotal) VALUES (3, 2, 1, 40.0);
 
+INSERT INTO `document` (title, content, version) VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
+
 
 /**
  * (MySQL-)Database Schema for validator tests
diff --git a/tests/data/oci.sql b/tests/data/oci.sql
index c3d571fb59..90e0e897cf 100644
--- a/tests/data/oci.sql
+++ b/tests/data/oci.sql
@@ -19,6 +19,7 @@ BEGIN EXECUTE IMMEDIATE 'DROP TABLE "constraints"'; EXCEPTION WHEN OTHERS THEN I
 BEGIN EXECUTE IMMEDIATE 'DROP TABLE "bool_values"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP TABLE "animal"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP TABLE "default_pk"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
+BEGIN EXECUTE IMMEDIATE 'DROP TABLE "document"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP VIEW "animal_view"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP TABLE "validator_main"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP TABLE "validator_ref"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -942 THEN RAISE; END IF; END;--
@@ -32,6 +33,7 @@ BEGIN EXECUTE IMMEDIATE 'DROP SEQUENCE "order_with_null_fk_SEQ"'; EXCEPTION WHEN
 BEGIN EXECUTE IMMEDIATE 'DROP SEQUENCE "null_values_SEQ"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -2289 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP SEQUENCE "bool_values_SEQ"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -2289 THEN RAISE; END IF; END;--
 BEGIN EXECUTE IMMEDIATE 'DROP SEQUENCE "animal_SEQ"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -2289 THEN RAISE; END IF; END;--
+BEGIN EXECUTE IMMEDIATE 'DROP SEQUENCE "document_SEQ"'; EXCEPTION WHEN OTHERS THEN IF SQLCODE != -2289 THEN RAISE; END IF; END;--
 
 /* STATEMENTS */
 
@@ -171,6 +173,15 @@ CREATE TABLE "default_pk" (
   CONSTRAINT "default_pk_PK" PRIMARY KEY ("id") ENABLE
 );
 
+CREATE TABLE "document" (
+  "id" integer,
+  "title" varchar2(255) not null,
+  "content" varchar(4000),
+  "version" integer default 0 not null,
+  CONSTRAINT "document_PK" PRIMARY KEY ("id") ENABLE
+);
+CREATE SEQUENCE "document_SEQ";
+
 CREATE VIEW "animal_view" AS SELECT * FROM "animal";
 
 /**
@@ -282,6 +293,8 @@ INSERT INTO "order_item_with_null_fk" ("order_id", "item_id", "quantity", "subto
 INSERT INTO "order_item_with_null_fk" ("order_id", "item_id", "quantity", "subtotal") VALUES (2, 3, 1, 8.0);
 INSERT INTO "order_item_with_null_fk" ("order_id", "item_id", "quantity", "subtotal") VALUES (3, 2, 1, 40.0);
 
+INSERT INTO "document" ("title", "content", "version") VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
+
 INSERT INTO "validator_main" ("id", "field1") VALUES (1, 'just a string1');
 INSERT INTO "validator_main" ("id", "field1") VALUES (2, 'just a string2');
 INSERT INTO "validator_main" ("id", "field1") VALUES (3, 'just a string3');
diff --git a/tests/data/postgres.sql b/tests/data/postgres.sql
index feceea4cc6..3c813b0602 100644
--- a/tests/data/postgres.sql
+++ b/tests/data/postgres.sql
@@ -19,6 +19,7 @@ DROP TABLE IF EXISTS "constraints" CASCADE;
 DROP TABLE IF EXISTS "bool_values" CASCADE;
 DROP TABLE IF EXISTS "animal" CASCADE;
 DROP TABLE IF EXISTS "default_pk" CASCADE;
+DROP TABLE IF EXISTS "document" CASCADE;
 DROP VIEW IF EXISTS "animal_view";
 DROP SCHEMA IF EXISTS "schema1" CASCADE;
 DROP SCHEMA IF EXISTS "schema2" CASCADE;
@@ -136,7 +137,6 @@ CREATE TABLE "bool_values" (
   default_false boolean not null default false
 );
 
-
 CREATE TABLE "animal" (
   id serial primary key,
   type varchar(255) not null
@@ -147,6 +147,13 @@ CREATE TABLE "default_pk" (
   type varchar(255) not null
 );
 
+CREATE TABLE "animal" (
+  id serial primary key,
+  title varchar(255) not null,
+  content text not null,
+  version integer not null default 0
+);
+
 CREATE VIEW "animal_view" AS SELECT * FROM "animal";
 
 INSERT INTO "animal" (type) VALUES ('yiiunit\data\ar\Cat');
@@ -194,6 +201,8 @@ INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VA
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (2, 3, 1, 8.0);
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (3, 2, 1, 40.0);
 
+INSERT INTO "document" (title, content, version) VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
+
 /**
  * (Postgres-)Database Schema for validator tests
  */
diff --git a/tests/data/sqlite.sql b/tests/data/sqlite.sql
index a0349a4b69..198d10f793 100644
--- a/tests/data/sqlite.sql
+++ b/tests/data/sqlite.sql
@@ -16,6 +16,7 @@ DROP TABLE IF EXISTS "type";
 DROP TABLE IF EXISTS "null_values";
 DROP TABLE IF EXISTS "animal";
 DROP TABLE IF EXISTS "default_pk";
+DROP TABLE IF EXISTS "document";
 DROP VIEW IF EXISTS "animal_view";
 
 CREATE TABLE "profile" (
@@ -123,6 +124,14 @@ CREATE TABLE "default_pk" (
   PRIMARY KEY (id)
 );
 
+CREATE TABLE "document" (
+  id INTEGER NOT NULL,
+  title VARCHAR(255) NOT NULL,
+  content text,
+  version INTEGER NOT NULL DEFAULT '0',
+  PRIMARY KEY (id)
+);
+
 CREATE VIEW "animal_view" AS SELECT * FROM "animal";
 
 INSERT INTO "animal" ("type") VALUES ('yiiunit\data\ar\Cat');
@@ -166,6 +175,8 @@ INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VA
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (2, 3, 1, 8.0);
 INSERT INTO "order_item_with_null_fk" (order_id, item_id, quantity, subtotal) VALUES (3, 2, 1, 40.0);
 
+INSERT INTO "document" (title, content, version) VALUES ('Yii 2.0 guide', 'This is Yii 2.0 guide', 0);
+
 /**
  * (SqLite-)Database Schema for validator tests
  */
diff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php
index bb0a61eace..5ee66a1643 100644
--- a/tests/framework/db/ActiveRecordTest.php
+++ b/tests/framework/db/ActiveRecordTest.php
@@ -4,6 +4,7 @@ namespace yiiunit\framework\db;
 use yiiunit\data\ar\ActiveRecord;
 use yiiunit\data\ar\Category;
 use yiiunit\data\ar\Customer;
+use yiiunit\data\ar\Document;
 use yiiunit\data\ar\NullValues;
 use yiiunit\data\ar\OrderItem;
 use yiiunit\data\ar\Order;
@@ -706,4 +707,20 @@ class ActiveRecordTest extends DatabaseTestCase
         $this->assertTrue($record->save(false));
         $this->assertEquals(1, $record->id);
     }
+
+    public function testOptimisticLock()
+    {
+        /* @var $record Document */
+
+        $record = Document::findOne(1);
+        $record->content = 'New Content';
+        $record->save(false);
+        $this->assertEquals(1, $record->version);
+
+        $record = Document::findOne(1);
+        $record->content = 'Rewrite attempt content';
+        $record->version = 0;
+        $this->setExpectedException('yii\db\StaleObjectException');
+        $record->save(false);
+    }
 }