diff --git a/README.rst b/README.rst index 625764d..802ee5b 100644 --- a/README.rst +++ b/README.rst @@ -50,12 +50,12 @@ that you checked out, go into the root of the repository and type:: $ svn info -This adapter has been tested against revision 41 from Google +This adapter has been tested against revisions 46 from Google AppEngine's svn repository. To apply the patch, do the following from a command line:: $ cd googleappengine-read-only - $ patch -p0 < gae_patch_r41.txt + $ patch -p0 < gae_patch_r46.txt you should see output similar to:: diff --git a/gae_patches/gae_patch_r46.txt b/gae_patches/gae_patch_r46.txt new file mode 100644 index 0000000..f789e00 --- /dev/null +++ b/gae_patches/gae_patch_r46.txt @@ -0,0 +1,34 @@ +Index: python/dev_appserver.py +=================================================================== +--- python/dev_appserver.py (revision 46) ++++ python/dev_appserver.py (working copy) +@@ -37,6 +37,7 @@ + SCRIPT_DIR = os.path.join(DIR_PATH, 'google', 'appengine', 'tools') + + EXTRA_PATHS = [ ++ "PATH/TO/MONGO-APPENGINE-CONNECTOR/DIRECTORY", + DIR_PATH, + os.path.join(DIR_PATH, 'lib', 'antlr3'), + os.path.join(DIR_PATH, 'lib', 'django'), +Index: python/google/appengine/tools/dev_appserver.py +=================================================================== +--- python/google/appengine/tools/dev_appserver.py (revision 46) ++++ python/google/appengine/tools/dev_appserver.py (working copy) +@@ -76,7 +76,7 @@ + from google.appengine.api import appinfo + from google.appengine.api import croninfo + from google.appengine.api import datastore_admin +-from google.appengine.api import datastore_file_stub ++import datastore_mongo_stub + from google.appengine.api import mail_stub + from google.appengine.api import urlfetch_stub + from google.appengine.api import user_service_stub +@@ -3040,7 +3040,7 @@ + + apiproxy_stub_map.apiproxy = apiproxy_stub_map.APIProxyStubMap() + +- datastore = datastore_file_stub.DatastoreFileStub( ++ datastore = datastore_mongo_stub.DatastoreMongoStub( + app_id, datastore_path, history_path, require_indexes=require_indexes) + apiproxy_stub_map.apiproxy.RegisterStub('datastore_v3', datastore) + diff --git a/test/test_site/index.yaml b/test/test_site/index.yaml index a2e3791..9b09ab0 100644 --- a/test/test_site/index.yaml +++ b/test/test_site/index.yaml @@ -10,11 +10,11 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used 20 times in query history. +# Used 10 times in query history. - kind: Ancestor ancestor: yes -# Used 6 times in query history. +# Used 3 times in query history. - kind: Ancestor2 ancestor: yes @@ -42,27 +42,41 @@ indexes: - name: title direction: desc -# Used 2 times in query history. +# Used once in query history. - kind: Everything properties: - name: blob - name: list -# Used 2 times in query history. +# Used once in query history. - kind: Everything properties: - name: list - name: blob -# Used 2 times in query history. +# Used once in query history. - kind: Everything properties: - name: list - name: bool direction: desc -# Used 2 times in query history. +# Used once in query history. - kind: KeyPath properties: - name: __key__ direction: desc + +# Used once in query history. +- kind: TestModel + properties: + - name: number + - name: text + +# Used once in query history. +- kind: TestModel + properties: + - name: number + - name: text2 + - name: text + direction: desc