Fix legacy examples. Resolves #78.

tomwalder · Dec 22, 2015 · 5edf1d5 · 5edf1d5
1 parent 4a44eeb
commit 5edf1d5
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 10 deletions.
diff --git a/examples/ancestor_key_lookups.php b/examples/ancestor_key_lookups.php
@@ -8,7 +8,7 @@
 
 $obj_person_schema = (new GDS\Schema('Person'))->addString('name')->addString('description');
 
-$obj_store = new GDS\Store($obj_gateway, $obj_person_schema);
+$obj_store = new GDS\Store($obj_person_schema, $obj_gateway);
 
 // Load the parent (run 'ancestor_keys.php' if needed to create it)
 $obj_stored_parent = $obj_store->fetchOne("SELECT * FROM Person WHERE __key__ = KEY(Person, 'parent@example.com')");

diff --git a/examples/ancestor_keys.php b/examples/ancestor_keys.php
@@ -8,7 +8,7 @@
 
 $obj_person_schema = (new GDS\Schema('Person'))->addString('name')->addString('description');
 
-$obj_store = new GDS\Store($obj_gateway, $obj_person_schema);
+$obj_store = new GDS\Store($obj_person_schema, $obj_gateway);
 
 // Create the parent
 $obj_john = new \GDS\Entity();

diff --git a/examples/ancestor_keys_auto_insert.php b/examples/ancestor_keys_auto_insert.php
@@ -8,7 +8,7 @@
 
 $obj_person_schema = (new GDS\Schema('Person'))->addString('name')->addString('description');
 
-$obj_store = new GDS\Store($obj_gateway, $obj_person_schema);
+$obj_store = new GDS\Store($obj_person_schema, $obj_gateway);
 
 // Create the parent
 $obj_john = $obj_store->createEntity();

diff --git a/examples/auto_insert_keys.php b/examples/auto_insert_keys.php
@@ -6,7 +6,7 @@
  */
 require_once('boilerplate.php');
 
-$obj_store = new GDS\Store($obj_gateway, 'Temperatures');
+$obj_store = new GDS\Store('Temperatures', $obj_gateway);
 
 // Delete ALL
 // $obj_store->delete($obj_store->fetchAll());

diff --git a/examples/boilerplate.php b/examples/boilerplate.php
@@ -9,12 +9,25 @@
 
 require_once('Book.php');
 
+// ============================================================================
+// ============================================================================
+// IMPORTANT - examples using this file operate on the remote Google API client
+// ============================================================================
+// ============================================================================
+
 // We'll need a Google_Client, use our convenience method
 $obj_client = GDS\Gateway\GoogleAPIClient::createGoogleClient(GDS_APP_NAME, GDS_SERVICE_ACCOUNT_NAME, GDS_KEY_FILE_PATH);
 
 // Gateway requires a Google_Client and Dataset ID
 $obj_gateway = new GDS\Gateway\GoogleAPIClient($obj_client, GDS_DATASET_ID);
 
+// Alternative native gateway, auto-detect dataset. Should work in dev or live AppEngine
+// But not in scripts.
+$obj_gateway = new GDS\Gateway\ProtoBuf();
+
+// ============================================================================
+// ============================================================================
+
 // Define our Model Schema
 $obj_book_schema = (new GDS\Schema('Book'))
     ->addString('title')

diff --git a/examples/datetime_binding.php b/examples/datetime_binding.php
@@ -12,7 +12,7 @@
     ->addDatetime('due', TRUE);
 
 // Store requires a Gateway and Schema
-$obj_task_store = new GDS\Store($obj_gateway, $obj_task_schema);
+$obj_task_store = new GDS\Store($obj_task_schema, $obj_gateway);
 
 // Insert some data, with datetime binding
 $obj_task_1 = $obj_task_store->createEntity([

diff --git a/examples/dynamic_schema.php b/examples/dynamic_schema.php
@@ -6,7 +6,7 @@
  */
 require_once('boilerplate.php');
 
-$obj_store = new GDS\Store($obj_gateway, 'Friend');
+$obj_store = new GDS\Store('Friend', $obj_gateway);
 
 // So now create a simple Model object
 $obj_charlie = new GDS\Entity();

diff --git a/examples/fetch.php b/examples/fetch.php
@@ -35,7 +35,7 @@
     describeResult($obj_book);
 }
 
-$obj_store = new GDS\Store($obj_gateway, 'Contact');
+$obj_store = new GDS\Store('Contact', $obj_gateway);
 $arr_contacts = $obj_store->fetchByNames(['tom@docnet.nu', 'beermonster@gmail.com']);
 foreach($arr_contacts as $obj_contact) {
     echo "  Found: {$obj_contact->first_name}, {$obj_contact->last_name}", PHP_EOL;

diff --git a/examples/list_create.php b/examples/list_create.php
@@ -18,7 +18,7 @@
     ->addStringList('tags', TRUE);
 
 // Configure the Store
-$obj_store = new GDS\Store($obj_gateway, $obj_contact_schema);
+$obj_store = new GDS\Store($obj_contact_schema, $obj_gateway);
 
 // Create 1
 $obj_contact1 = $obj_store->createEntity([

diff --git a/examples/list_fetch.php b/examples/list_fetch.php
@@ -18,7 +18,7 @@
     ->addStringList('tags', TRUE);
 
 // Configure the Store
-$obj_store = new GDS\Store($obj_gateway, $obj_contact_schema);
+$obj_store = new GDS\Store($obj_contact_schema, $obj_gateway);
 
 // A couple of tests
 show($obj_store->fetchAll("SELECT * FROM Contact_v1 WHERE tags = 'newsletter' AND tags = 'customer'"));

diff --git a/examples/simple.php b/examples/simple.php
@@ -14,7 +14,7 @@
 $obj_gateway = new GDS\Gateway\GoogleAPIClient($obj_client, GDS_DATASET_ID);
 
 // Store requires a Gateway and Kind
-$obj_book_store = new GDS\Store($obj_gateway, 'Book');
+$obj_book_store = new GDS\Store('Book', $obj_gateway);
 
 // Fetch a record
 $obj_book = $obj_book_store->fetchOne();