Merge branch 'master' of github.com:yiisoft/yii2

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;

tests/unit/data/ar/redis/Customer.php

@@ -28,6 +28,14 @@ class Customer extends ActiveRecord
     }
 
     /**
+     * @return \yii\redis\ActiveQuery
+     */
+    public function getOrdersWithNullFK()
+    {
+        return $this->hasMany(OrderWithNullFK::className(), ['customer_id' => 'id']);
+    }
+
+    /**
      * @inheritdoc
      */
     public function afterSave($insert)

tests/unit/data/ar/redis/OrderItemWithNullFK.php

+<?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'];
+    }
+}

tests/unit/data/ar/redis/OrderWithNullFK.php

+<?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'];
+    }
+}

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" (

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();