From 9c564808e5375676ce0b871bb7d49f134122ae87 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 3 Jun 2014 14:02:41 +0400
Subject: [PATCH 1/3] Added missing models for Redis tests

---
 .../data/ar/redis/OrderItemWithNullFK.php     | 24 +++++++++++++++++++
 tests/unit/data/ar/redis/OrderWithNullFK.php  | 24 +++++++++++++++++++
 .../extensions/redis/ActiveRecordTest.php     | 12 ++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 tests/unit/data/ar/redis/OrderItemWithNullFK.php
 create mode 100644 tests/unit/data/ar/redis/OrderWithNullFK.php

diff --git a/tests/unit/data/ar/redis/OrderItemWithNullFK.php b/tests/unit/data/ar/redis/OrderItemWithNullFK.php
new file mode 100644
index 0000000000..1a95684a4c
--- /dev/null
+++ b/tests/unit/data/ar/redis/OrderItemWithNullFK.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace yiiunit\data\ar\redis;
+
+/**
+ * Class OrderItem
+ *
+ * @property integer $order_id
+ * @property integer $item_id
+ * @property integer $quantity
+ * @property string $subtotal
+ */
+class OrderItemWithNullFK extends ActiveRecord
+{
+    public static function primaryKey()
+    {
+        return ['order_id', 'item_id'];
+    }
+
+    public function attributes()
+    {
+        return ['order_id', 'item_id', 'quantity', 'subtotal'];
+    }
+}
diff --git a/tests/unit/data/ar/redis/OrderWithNullFK.php b/tests/unit/data/ar/redis/OrderWithNullFK.php
new file mode 100644
index 0000000000..06a805d229
--- /dev/null
+++ b/tests/unit/data/ar/redis/OrderWithNullFK.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace yiiunit\data\ar\redis;
+
+/**
+ * Class Order
+ *
+ * @property integer $id
+ * @property integer $customer_id
+ * @property integer $created_at
+ * @property string $total
+ */
+class OrderWithNullFK extends ActiveRecord
+{
+    public static function primaryKey()
+    {
+        return ['id'];
+    }
+
+    public function attributes()
+    {
+        return ['id', 'customer_id', 'created_at', 'total'];
+    }
+}
diff --git a/tests/unit/extensions/redis/ActiveRecordTest.php b/tests/unit/extensions/redis/ActiveRecordTest.php
index 93789929eb..0d94201299 100644
--- a/tests/unit/extensions/redis/ActiveRecordTest.php
+++ b/tests/unit/extensions/redis/ActiveRecordTest.php
@@ -8,6 +8,8 @@ use yiiunit\data\ar\redis\Customer;
 use yiiunit\data\ar\redis\OrderItem;
 use yiiunit\data\ar\redis\Order;
 use yiiunit\data\ar\redis\Item;
+use yiiunit\data\ar\redis\OrderItemWithNullFK;
+use yiiunit\data\ar\redis\OrderWithNullFK;
 use yiiunit\framework\ar\ActiveRecordTestTrait;
 
 /**
@@ -37,6 +39,16 @@ class ActiveRecordTest extends RedisTestCase
         return OrderItem::className();
     }
 
+    public function getOrderWithNullFKClass()
+    {
+        return OrderWithNullFK::className();
+    }
+
+    public function getOrderItemWithNullFKmClass()
+    {
+        return OrderItemWithNullFK::className();
+    }
+
     public function setUp()
     {
         parent::setUp();

From 4769e730fa618e30d140a149d4aef752a6f4451a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 3 Jun 2014 14:20:30 +0400
Subject: [PATCH 2/3] Fixed sqlite schema SQL

---
 tests/unit/data/sqlite.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/data/sqlite.sql b/tests/unit/data/sqlite.sql
index aafc19d2e1..09c9da598c 100644
--- a/tests/unit/data/sqlite.sql
+++ b/tests/unit/data/sqlite.sql
@@ -72,7 +72,7 @@ CREATE TABLE "order_item_with_null_fk" (
   order_id INTEGER,
   item_id INTEGER,
   quantity INTEGER NOT NULL,
-  subtotal decimal(10,0) NOT NULL,
+  subtotal decimal(10,0) NOT NULL
 );
 
 CREATE TABLE "composite_fk" (

From 2a75cd19c06015ae1de949b1145787629483235a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 3 Jun 2014 14:24:11 +0400
Subject: [PATCH 3/3] Added missing relations to Redis/Elasticsearch test
 models

---
 tests/unit/data/ar/elasticsearch/Customer.php | 5 +++++
 tests/unit/data/ar/redis/Customer.php         | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/tests/unit/data/ar/elasticsearch/Customer.php b/tests/unit/data/ar/elasticsearch/Customer.php
index ac75f5ffc4..19c2929a46 100644
--- a/tests/unit/data/ar/elasticsearch/Customer.php
+++ b/tests/unit/data/ar/elasticsearch/Customer.php
@@ -35,6 +35,11 @@ class Customer extends ActiveRecord
         return $this->hasMany(Order::className(), ['customer_id' => 'id'])->orderBy('created_at');
     }
 
+    public function getOrdersWithNullFK()
+    {
+        return $this->hasMany(OrderWithNullFK::className(), ['customer_id' => 'id'])->orderBy('created_at');
+    }
+
     public function afterSave($insert)
     {
         ActiveRecordTest::$afterSaveInsert = $insert;
diff --git a/tests/unit/data/ar/redis/Customer.php b/tests/unit/data/ar/redis/Customer.php
index 1bdf2b65ad..2743ec60d2 100644
--- a/tests/unit/data/ar/redis/Customer.php
+++ b/tests/unit/data/ar/redis/Customer.php
@@ -27,6 +27,14 @@ class Customer extends ActiveRecord
         return $this->hasMany(Order::className(), ['customer_id' => 'id']);
     }
 
+    /**
+     * @return \yii\redis\ActiveQuery
+     */
+    public function getOrdersWithNullFK()
+    {
+        return $this->hasMany(OrderWithNullFK::className(), ['customer_id' => 'id']);
+    }
+
     /**
      * @inheritdoc
      */