CHANGE default indexing from FALSE to TRUE. Now easier to get started, more consistent with https://cloud.google.com/datastore/docs/concepts/indexes. Fixes #10, closes #17

Author: twalder-docnet

examples/dynamic_schema.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Create a single record in GDS
+ *
+ * @author Tom Walder <[email protected]>
+ */
+require_once('boilerplate.php');
+
+$obj_store = new GDS\Store($obj_gateway, 'Friend');
+
+// So now create a simple Model object
+$obj_charlie = new GDS\Entity();
+$obj_charlie->name = 'Charlie';
+$obj_charlie->age = 26;
+$obj_charlie->height = 120;
+$obj_store->upsert($obj_charlie);
+echo "Created: ", $obj_charlie->getKeyId(), PHP_EOL;
+
+// So now create a simple Model object
+$obj_max = new GDS\Entity();
+$obj_max->name = 'Max';
+$obj_max->age = 26;
+$obj_max->height = 122;
+$obj_store->upsert($obj_max);
+echo "Created: ", $obj_max->getKeyId(), PHP_EOL;
+
+echo "Query 1:", PHP_EOL;
+foreach($obj_store->fetchAll("SELECT * FROM Friend WHERE age = 26") as $obj_result) {
+    echo "Got: ", $obj_result->getKeyId(), ' ' , $obj_result->name, PHP_EOL;
+}
+
+echo "Query 2:", PHP_EOL;
+foreach($obj_store->fetchAll("SELECT * FROM Friend WHERE age = 26 AND height = 122") as $obj_result) {
+    echo "Got: ", $obj_result->getKeyId(), ' ' , $obj_result->name, PHP_EOL;
+}

src/GDS/Mapper.php

@@ -196,6 +196,7 @@ private function createProperties(Entity $obj_gds_entity)
                             $int_dynamic_type = Schema::PROPERTY_DATETIME;
                             break;
                         }
+                        // No break on purpose - 'other' objects will be cast to string ;(
 
                     case 'resource':
                     case 'NULL':
@@ -205,7 +206,7 @@ private function createProperties(Entity $obj_gds_entity)
                         $int_dynamic_type = Schema::PROPERTY_STRING;
                         $mix_value = (string)$mix_value;
                 }
-                $arr_property_map[$str_field_name] = $this->createProperty(['type' => $int_dynamic_type, 'index' => FALSE], $mix_value);
+                $arr_property_map[$str_field_name] = $this->createProperty(['type' => $int_dynamic_type, 'index' => TRUE], $mix_value);
             }
         }
         return $arr_property_map;
@@ -223,9 +224,9 @@ private function createProperty(array $arr_field_def, $mix_value)
         $obj_property = new \Google_Service_Datastore_Property();
 
         // Indexed?
-        $bol_index = FALSE;
-        if(isset($arr_field_def['index']) && TRUE === $arr_field_def['index']) {
-            $bol_index = TRUE;
+        $bol_index = TRUE;
+        if(isset($arr_field_def['index']) && FALSE === $arr_field_def['index']) {
+            $bol_index = FALSE;
         }
         $obj_property->setIndexed($bol_index);
 

src/GDS/Schema.php

@@ -69,7 +69,7 @@ public function __construct($str_kind)
      * @param bool $bol_index
      * @return $this
      */
-    public function addProperty($str_name, $int_type = self::PROPERTY_STRING, $bol_index = FALSE)
+    public function addProperty($str_name, $int_type = self::PROPERTY_STRING, $bol_index = TRUE)
     {
         $this->arr_defined_properties[$str_name] = [
             'type' => $int_type,
@@ -85,7 +85,7 @@ public function addProperty($str_name, $int_type = self::PROPERTY_STRING, $bol_i
      * @param bool $bol_index
      * @return Schema
      */
-    public function addString($str_name, $bol_index = FALSE)
+    public function addString($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_STRING, $bol_index);
     }
@@ -97,7 +97,7 @@ public function addString($str_name, $bol_index = FALSE)
      * @param bool $bol_index
      * @return Schema
      */
-    public function addInteger($str_name, $bol_index = FALSE)
+    public function addInteger($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_INTEGER, $bol_index);
     }
@@ -109,7 +109,7 @@ public function addInteger($str_name, $bol_index = FALSE)
      * @param bool $bol_index
      * @return Schema
      */
-    public function addDatetime($str_name, $bol_index = FALSE)
+    public function addDatetime($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_DATETIME, $bol_index);
     }
@@ -121,7 +121,7 @@ public function addDatetime($str_name, $bol_index = FALSE)
      * @param bool $bol_index
      * @return Schema
      */
-    public function addFloat($str_name, $bol_index = FALSE)
+    public function addFloat($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_FLOAT, $bol_index);
     }
@@ -133,7 +133,7 @@ public function addFloat($str_name, $bol_index = FALSE)
      * @param bool $bol_index
      * @return Schema
      */
-    public function addBoolean($str_name, $bol_index = FALSE)
+    public function addBoolean($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_BOOLEAN, $bol_index);
     }
@@ -145,7 +145,7 @@ public function addBoolean($str_name, $bol_index = FALSE)
      * @param bool $bol_index
      * @return Schema
      */
-    public function addStringList($str_name, $bol_index = FALSE)
+    public function addStringList($str_name, $bol_index = TRUE)
     {
         return $this->addProperty($str_name, self::PROPERTY_STRING_LIST, $bol_index);
     }