Merge pull request #493 from tseaver/implicit_dataset_id

Derive implicit dataset ID from environment.
googleapis · Jan 7, 2015 · 8faba35 · 8faba35
2 parents 9b64977 + 10b7c9e
commit 8faba35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/gcloud/datastore/__init__.py b/gcloud/datastore/__init__.py
@@ -77,6 +77,7 @@ def set_default_dataset(dataset_id=None):
         dataset_id = os.getenv(_DATASET_ENV_VAR_NAME)
 
     if dataset_id is not None:
+        _implicit_environ.DATASET_ID = dataset_id
         _implicit_environ.DATASET = get_dataset(dataset_id)
 
 

diff --git a/gcloud/datastore/_implicit_environ.py b/gcloud/datastore/_implicit_environ.py
@@ -8,6 +8,9 @@
 """
 
 
+DATASET_ID = None
+"""Module global to allow persistent implied dataset ID from enviroment."""
+
 DATASET = None
 """Module global to allow persistent implied dataset from enviroment."""
 

diff --git a/gcloud/datastore/test___init__.py b/gcloud/datastore/test___init__.py
@@ -73,20 +73,26 @@ def custom_get_dataset(local_dataset_id):
 
     def test_set_from_env_var(self):
         from gcloud.datastore import _DATASET_ENV_VAR_NAME
+        from gcloud.datastore import _implicit_environ
 
         # Make a custom getenv function to Monkey.
         DATASET = 'dataset'
         VALUES = {
             _DATASET_ENV_VAR_NAME: DATASET,
         }
         self._test_with_environ(VALUES, DATASET)
+        self.assertEqual(_implicit_environ.DATASET_ID, DATASET)
 
     def test_no_env_var_set(self):
+        from gcloud.datastore import _implicit_environ
         self._test_with_environ({}, None)
+        self.assertEqual(_implicit_environ.DATASET_ID, None)
 
     def test_set_explicit(self):
+        from gcloud.datastore import _implicit_environ
         DATASET_ID = 'DATASET'
         self._test_with_environ({}, DATASET_ID, dataset_id=DATASET_ID)
+        self.assertEqual(_implicit_environ.DATASET_ID, DATASET_ID)
 
 
 class Test_set_default_connection(unittest2.TestCase):