Merge pull request #110 from kyle-mccarthy/master

added accessor for default primary key

ActiveDataProvider.php

@@ -9,6 +9,7 @@
 
 use yii\base\InvalidCallException;
 use yii\base\InvalidConfigException;
+use yii\db\ActiveQueryInterface;
 
 /**
  * ActiveDataProvider is an enhanced version of [[\yii\data\ActiveDataProvider]] specific to the ElasticSearch.
@@ -116,4 +117,44 @@ protected function prepareTotalCount()
         $results = $this->getQueryResults();
         return (int)$results['hits']['total'];
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function prepareKeys($models)
+    {
+        $keys = [];
+        if ($this->key !== null) {
+            foreach ($models as $model) {
+                if (is_string($this->key)) {
+                    $keys[] = $model[$this->key];
+                } else {
+                    $keys[] = call_user_func($this->key, $model);
+                }
+            }
+
+            return $keys;
+        } elseif ($this->query instanceof ActiveQueryInterface) {
+            /* @var $class \yii\db\ActiveRecord */
+            $class = $this->query->modelClass;
+            $pks = $class::primaryKey();
+            if (count($pks) === 1) {
+                foreach ($models as $model) {
+                    $keys[] = $model->primaryKey;
+                }
+            } else {
+                foreach ($models as $model) {
+                    $kk = [];
+                    foreach ($pks as $pk) {
+                        $kk[$pk] = $model[$pk];
+                    }
+                    $keys[] = $kk;
+                }
+            }
+
+            return $keys;
+        } else {
+            return array_keys($models);
+        }
+    }
 }

CHANGELOG.md

@@ -12,6 +12,7 @@ Yii Framework 2 elasticsearch extension Change Log
 - Enh: Bulk API implemented and used in AR (tibee, beowulfenator)
 - Enh #82: Support HTTPS protocol (dor-denis, beowulfenator)
 - Enh #43: Elasticsearch log target (trntv, beowulfenator)
+- Bug: Added accessor method for the default elasticsearch primary key (kyle-mccarthy)
 
 
 2.0.4 March 17, 2016