google-cloud-datastore 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c300ee184929b5e46058e32af1e18a2e0e786e3eb17b32d24a265713e442b75d
-  data.tar.gz: 06752add810608b745cc157a60fcfc23aa77ab54a7395f54e8f8b2d3867fc882
+  metadata.gz: ded45a15f44ec5a2e095ef0369db26c2a4a65e59c2af1e08bb8f6028736062ea
+  data.tar.gz: 8d7321547294a1c1ab492df132e19300a0466f252e74f9c7122fb7941bbaeac7
 SHA512:
-  metadata.gz: aa87df55a375dba1110cd28463a59f0c81e81cfa4aa513edeb380302f63e6e4610a1e5064a47af57753aa4e31c21c092276cbbf92325a6a55b9e3cffb7cbbf35
-  data.tar.gz: f39b9d73f4c149cf633b376d10aa811b7f3e8a607e294753e0b796319312082771a112d049c90d548fd80c8024b7b4b18fa11940a88fe07a62ee8e16b7b61d3f
+  metadata.gz: 8a4039bbc1c34698507c3b7a1e2c22b011f4df3ea66a57927c7dd147c4468d97c85f15b49efa6c06dcb124815ad5fc4098eeaa8e6f54d23570489e6da0d8dbf3
+  data.tar.gz: af0981ba4ea2bd054ba35ddd372399addbbb5e0d0c8e4032f518b48ab03065771af8a6185dea29483a9948ae42147011c0f6a100c747dd08100736780a5cb286

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 2.5.0 (2023-02-09)
+
+#### Features
+
+* Added support for multiple database ([#20038](https://github.com/googleapis/google-cloud-ruby/issues/20038)) 
+
+### 2.4.0 (2023-02-02)
+
+#### Features
+
+* Support query count for Datastore ([#20039](https://github.com/googleapis/google-cloud-ruby/issues/20039)) 
+
 ### 2.3.1 (2022-12-14)
 
 #### Bug Fixes

data/lib/google/cloud/datastore/aggregate_query.rb

@@ -0,0 +1,139 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require "google/cloud/datastore/v1"
+
+module Google
+  module Cloud
+    module Datastore
+      ##
+      # # AggregateQuery
+      #
+      # An aggregate query can be used to fetch aggregate values (ex: count) for a query
+      #
+      # @example
+      #   require "google/cloud/datastore"
+      #
+      #   datastore = Google::Cloud::Datastore.new
+      #
+      #   query = Google::Cloud::Datastore::Query.new
+      #   query.kind("Task")
+      #        .where("done", "=", false)
+      #
+      #   Create an aggregate query
+      #   aggregate_query = query.aggregate_query
+      #                          .add_count
+      #
+      #   aggregate_query_results = dataset.run_aggregation aggregate_query
+      #   puts aggregate_query_results.get
+      #
+      # @example Alias an aggregate query
+      #   require "google/cloud/datastore"
+      #
+      #   datastore = Google::Cloud::Datastore.new
+      #
+      #   query = Google::Cloud::Datastore::Query.new
+      #   query.kind("Task")
+      #        .where("done", "=", false)
+      #
+      #   Create an aggregate query
+      #   aggregate_query = query.aggregate_query
+      #                          .add_count aggregate_alias: 'total'
+      #
+      #   aggregate_query_results = dataset.run_aggregation aggregate_query
+      #   puts aggregate_query_results.get('total')
+      #
+      class AggregateQuery
+        ##
+        # @private The Google::Cloud::Datastore::V1::Query object.
+        attr_reader :query
+
+        ##
+        # @private Array of Google::Cloud::Datastore::V1::AggregationQuery::Aggregation objects
+        attr_reader :aggregates
+
+        ##
+        # @private Creates a new AggregateQuery
+        def initialize query
+          @query = query
+          @aggregates = []
+        end
+
+        ##
+        # Adds a count aggregate.
+        #
+        # @param aggregate_alias [String] Alias to refer to the aggregate. Optional
+        #
+        # @return [AggregateQuery] The modified aggregate query object with the added count aggregate.
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = Google::Cloud::Datastore::Query.new
+        #   query.kind("Task")
+        #        .where("done", "=", false)
+        #
+        #   Create an aggregate query
+        #   aggregate_query = query.aggregate_query
+        #                          .add_count
+        #
+        #   aggregate_query_results = dataset.run_aggregation aggregate_query
+        #   puts aggregate_query_results.get
+        #
+        # @example Alias an aggregate query
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = Google::Cloud::Datastore::Query.new
+        #   query.kind("Task")
+        #        .where("done", "=", false)
+        #
+        #   Create an aggregate query
+        #   aggregate_query = query.aggregate_query
+        #                          .add_count aggregate_alias: 'total'
+        #
+        #   aggregate_query_results = dataset.run_aggregation aggregate_query
+        #   puts aggregate_query_results.get('total')
+        #
+        def add_count aggregate_alias: nil
+          aggregate_alias ||= ALIASES[:count]
+          aggregates << Google::Cloud::Datastore::V1::AggregationQuery::Aggregation.new(
+            count: Google::Cloud::Datastore::V1::AggregationQuery::Aggregation::Count.new,
+            alias: aggregate_alias
+          )
+
+          self
+        end
+
+        # @private
+        def to_grpc
+          Google::Cloud::Datastore::V1::AggregationQuery.new(
+            nested_query: query,
+            aggregations: aggregates
+          )
+        end
+
+        ##
+        # @private
+        ALIASES = {
+          count: "count"
+        }.freeze
+      end
+    end
+  end
+end

data/lib/google/cloud/datastore/dataset/aggregate_query_results.rb

@@ -0,0 +1,115 @@
+# Copyright 2023 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Google
+  module Cloud
+    module Datastore
+      class Dataset
+        ##
+        # # AggregateQueryResults
+        #
+        # An AggregateQueryResult object is a representation for
+        # a result of an AggregateQuery or a GqlQuery.
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = Google::Cloud::Datastore::Query.new
+        #   query.kind("Task")
+        #        .where("done", "=", false)
+        #
+        #   Create an aggregate query
+        #   aggregate_query = query.aggregate_query
+        #                          .add_count
+        #
+        #   aggregate_query_results = dataset.run_aggregation aggregate_query
+        #   puts aggregate_query_results.get
+        #
+        class AggregateQueryResults
+          ##
+          # Read timestamp the query was done on the database at.
+          #
+          # @return Google::Protobuf::Timestamp
+          attr_reader :read_time
+
+          ##
+          # Retrieves the aggregate data.
+          #
+          # @param aggregate_alias [String] The alias used to access
+          #   the aggregate value. For an AggregateQuery with a
+          #   single aggregate field, this parameter can be omitted.
+          #
+          # @return [Integer] The aggregate value.
+          #
+          # @example
+          #   require "google/cloud/datastore"
+          #
+          #   datastore = Google::Cloud::Datastore.new
+          #
+          #   query = Google::Cloud::Datastore::Query.new
+          #   query.kind("Task")
+          #        .where("done", "=", false)
+          #
+          #   Create an aggregate query
+          #   aggregate_query = query.aggregate_query
+          #                          .add_count
+          #
+          #   aggregate_query_results = dataset.run_aggregation aggregate_query
+          #   puts aggregate_query_results.get
+          #
+          # @example Alias an aggregate query
+          #   require "google/cloud/datastore"
+          #
+          #   datastore = Google::Cloud::Datastore.new
+          #
+          #   query = Google::Cloud::Datastore::Query.new
+          #   query.kind("Task")
+          #        .where("done", "=", false)
+          #
+          #   Create an aggregate query
+          #   aggregate_query = query.aggregate_query
+          #                          .add_count aggregate_alias: 'total'
+          #
+          #   aggregate_query_results = dataset.run_aggregation aggregate_query
+          #   puts aggregate_query_results.get('total')
+          def get aggregate_alias = nil
+            if @aggregate_fields.count > 1 && aggregate_alias.nil?
+              raise ArgumentError, "Required param aggregate_alias for AggregateQuery with multiple aggregate fields"
+            end
+            aggregate_alias ||= @aggregate_fields.keys.first
+            @aggregate_fields[aggregate_alias]
+          end
+
+          ##
+          # @private New AggregateQueryResults from a
+          # Google::Cloud::Datastore::V1::RunAggregationQueryResponse object.
+          def self.from_grpc aggregate_query_response
+            aggregate_fields = aggregate_query_response
+                               .batch
+                               .aggregation_results[0]
+                               .aggregate_properties
+                               .to_h
+                               .transform_values { |v| v[:integer_value] }
+            new.tap do |s|
+              s.instance_variable_set :@aggregate_fields, aggregate_fields
+              s.instance_variable_set :@read_time, aggregate_query_response.batch.read_time
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/google/cloud/datastore/dataset.rb

@@ -24,6 +24,7 @@ require "google/cloud/datastore/gql_query"
 require "google/cloud/datastore/cursor"
 require "google/cloud/datastore/dataset/lookup_results"
 require "google/cloud/datastore/dataset/query_results"
+require "google/cloud/datastore/dataset/aggregate_query_results"
 require "google/cloud/datastore/transaction"
 require "google/cloud/datastore/read_only_transaction"
 
@@ -83,6 +84,26 @@ module Google
         end
         alias project project_id
 
+        ##
+        # The Datastore database connected to.
+        #
+        # @return [String] ID of the database
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new(
+        #     project_id: "my-todo-project",
+        #     credentials: "/path/to/keyfile.json",
+        #     database_id: "my-database"
+        #   )
+        #
+        #   datastore.database_id #=> "my-database"
+        #
+        def database_id
+          service.database
+        end
+
         ##
         # Generate IDs for a Key before creating an entity.
         #
@@ -453,6 +474,88 @@ module Google
         end
         alias run_query run
 
+        ##
+        # Retrieve aggregate results specified by an AggregateQuery.
+        #
+        # @param [AggregateQuery, GqlQuery] query The object with the aggregate criteria.
+        # @param [String] namespace The namespace the query is to run within.
+        # @param [Symbol] consistency The non-transactional read consistency to
+        #   use. Cannot be set to `:strong` for global queries. Accepted values
+        #   are `:eventual` and `:strong`.
+        #
+        #   The default consistency depends on the type of query used. See
+        #   [Eventual Consistency in Google Cloud
+        #   Datastore](https://cloud.google.com/datastore/docs/articles/balancing-strong-and-eventual-consistency-with-google-cloud-datastore/#h.tf76fya5nqk8)
+        #   for more information.
+        #
+        # @return [Google::Cloud::Datastore::Dataset::AggregateQueryResults]
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = datastore.query("Task")
+        #                    .where("done", "=", false)
+        #
+        #   aggregate_query = query.aggregate_query
+        #
+        #   res = datastore.run_aggregation aggregate_query
+        #
+        # @example Run an aggregate ancestor query with eventual consistency:
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   task_list_key = datastore.key "TaskList", "default"
+        #   query = datastore.query.kind("Task")
+        #                    .ancestor(task_list_key)
+        #
+        #   aggregate_query = query.aggregate_query
+        #
+        #   res = datastore.run_aggregation aggregate_query, consistency: :eventual
+        #
+        # @example Run the aggregate query within a namespace with the `namespace` option:
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = datastore.query("Task")
+        #                    .where("done", "=", false)
+        #
+        #   aggregate_query = query.aggregate_query
+        #
+        #   res = datastore.run_aggregation aggregate_query, namespace: "example-ns"
+        #
+        # @example Run the aggregate query with a GQL string.
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   gql_query = datastore.gql "SELECT COUNT(*) FROM Task WHERE done = @done",
+        #                             done: false
+        #   res = datastore.run_aggregation gql_query
+        #
+        # @example Run the aggregate GQL query within a namespace with `namespace` option:
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   gql_query = datastore.gql "SELECT COUNT(*) FROM Task WHERE done = @done",
+        #                             done: false
+        #   res = datastore.run_aggregation gql_query, namespace: "example-ns"
+        #
+        def run_aggregation aggregate_query, namespace: nil, consistency: nil
+          ensure_service!
+          unless aggregate_query.is_a?(AggregateQuery) || aggregate_query.is_a?(GqlQuery)
+            raise ArgumentError, "Cannot run a #{aggregate_query.class} object."
+          end
+          check_consistency! consistency
+          aggregate_query_res = service.run_aggregation_query aggregate_query.to_grpc, namespace,
+                                                              consistency: consistency
+          AggregateQueryResults.from_grpc aggregate_query_res
+        end
+
         ##
         # Creates a Datastore Transaction.
         #

data/lib/google/cloud/datastore/key.rb

@@ -69,6 +69,27 @@ module Google
         alias dataset_id project
         alias dataset_id= project=
 
+        ##
+        # The database of the Key.
+        #
+        # @return [String]
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new(
+        #     project: "my-todo-project",
+        #     database: "my-todo-database",
+        #     keyfile: "/path/to/keyfile.json"
+        #   )
+        #
+        #   task = datastore.find "Task", "sampleTask"
+        #   task.key.database #=> "my-todo-database"
+        #
+        attr_accessor :database
+        alias database_id database
+        alias database_id= database=
+
         ##
         # The namespace of the Key.
         #
@@ -281,9 +302,9 @@ module Google
             Google::Cloud::Datastore::V1::Key::PathElement.new path_args
           end
           grpc = Google::Cloud::Datastore::V1::Key.new path: grpc_path
-          if project || namespace
+          if project || database || namespace
             grpc.partition_id = Google::Cloud::Datastore::V1::PartitionId.new(
-              project_id: project.to_s, namespace_id: namespace.to_s
+              project_id: project.to_s, database_id: database.to_s, namespace_id: namespace.to_s
             )
           end
           grpc
@@ -304,6 +325,7 @@ module Google
           end
           if key_grpc.partition_id
             key.project = key_grpc.partition_id.project_id
+            key.database = key_grpc.partition_id.database_id
             key.namespace = key_grpc.partition_id.namespace_id
           end
           key.parent = Key.from_grpc key_grpc if key_grpc.path.count.positive?

data/lib/google/cloud/datastore/query.rb

@@ -15,6 +15,7 @@
 
 require "google/cloud/datastore/entity"
 require "google/cloud/datastore/key"
+require "google/cloud/datastore/aggregate_query"
 
 module Google
   module Cloud
@@ -425,6 +426,27 @@ module Google
         end
         alias distinct_on group_by
 
+        ##
+        # Creates an AggregateQuery object for the query.
+        #
+        # @return [AggregateQuery] New empty aggregate query.
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   query = Google::Cloud::Datastore::Query.new
+        #   query.kind("Task")
+        #        .where("done", "=", false)
+        #
+        #   Create an aggregate query
+        #   aggregate_query = query.aggregate_query
+        #
+        def aggregate_query
+          AggregateQuery.new @grpc
+        end
+
         # @private
         def to_grpc
           @grpc

data/lib/google/cloud/datastore/read_only_transaction.rb

@@ -157,6 +157,37 @@ module Google
         end
         alias run_query run
 
+        ##
+        # Retrieve aggregate query results specified by an AggregateQuery. The query is run within the
+        # transaction.
+        #
+        # @param [AggregateQuery, GqlQuery] query The Query object with the search criteria.
+        # @param [String] namespace The namespace the query is to run within.
+        #
+        # @return [Google::Cloud::Datastore::Dataset::AggregateQueryResults]
+        #
+        # @example
+        #   require "google/cloud/datastore"
+        #
+        #   datastore = Google::Cloud::Datastore.new
+        #
+        #   datastore.read_only_transaction do |tx|
+        #     query = tx.query("Task")
+        #               .where("done", "=", false)
+        #     aggregate_query = query.aggregate_query
+        #                            .add_count
+        #     res = tx.run_aggregation aggregate_query
+        #   end
+        #
+        def run_aggregation aggregate_query, namespace: nil
+          ensure_service!
+          unless aggregate_query.is_a?(AggregateQuery) || aggregate_query.is_a?(GqlQuery)
+            raise ArgumentError, "Cannot run a #{aggregate_query.class} object."
+          end
+          aggregate_query_results = service.run_aggregation_query aggregate_query.to_grpc, namespace, transaction: @id
+          Dataset::AggregateQueryResults.from_grpc aggregate_query_results
+        end
+
         ##
         # Begins a transaction.
         # This method is run when a new ReadOnlyTransaction is created.

data/lib/google/cloud/datastore/service.rb

@@ -29,14 +29,16 @@ module Google
         attr_accessor :credentials
         attr_accessor :host
         attr_accessor :timeout
+        attr_accessor :database
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, host: nil, timeout: nil
+        def initialize project, credentials, database, host: nil, timeout: nil
           @project = project
           @credentials = credentials
           @host = host
           @timeout = timeout
+          @database = database
         end
 
         def service
@@ -47,7 +49,7 @@ module Google
             config.endpoint = host if host
             config.lib_name = "gccl"
             config.lib_version = Google::Cloud::Datastore::VERSION
-            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}" }
+            config.metadata = { "google-cloud-resource-prefix": "projects/#{@project}/databases/#{database}" }
           end
         end
         attr_accessor :mocked_service
@@ -56,7 +58,7 @@ module Google
         # Allocate IDs for incomplete keys.
         # (This is useful for referencing an entity before it is inserted.)
         def allocate_ids *incomplete_keys
-          service.allocate_ids project_id: project, keys: incomplete_keys
+          service.allocate_ids project_id: project, database_id: database, keys: incomplete_keys
         end
 
         ##
@@ -64,7 +66,7 @@ module Google
         def lookup *keys, consistency: nil, transaction: nil
           read_options = generate_read_options consistency, transaction
 
-          service.lookup project_id: project, keys: keys, read_options: read_options
+          service.lookup project_id: project, database_id: database, keys: keys, read_options: read_options
         end
 
         # Query for entities.
@@ -82,12 +84,34 @@ module Google
           end
 
           service.run_query project_id: project,
+                            database_id: database,
                             partition_id: partition_id,
                             read_options: read_options,
                             query: query,
                             gql_query: gql_query
         end
 
+        ## Query for aggregates
+        def run_aggregation_query query, namespace = nil, consistency: nil, transaction: nil
+          gql_query = nil
+          if query.is_a? Google::Cloud::Datastore::V1::GqlQuery
+            gql_query = query
+            query = nil
+          end
+          read_options = generate_read_options consistency, transaction
+          if namespace
+            partition_id = Google::Cloud::Datastore::V1::PartitionId.new(
+              namespace_id: namespace
+            )
+          end
+
+          service.run_aggregation_query project_id: project,
+                                        partition_id: partition_id,
+                                        read_options: read_options,
+                                        aggregation_query: query,
+                                        gql_query: gql_query
+        end
+
         ##
         # Begin a new transaction.
         def begin_transaction read_only: nil, previous_transaction: nil
@@ -104,7 +128,7 @@ module Google
             )
             transaction_options.read_write = rw
           end
-          service.begin_transaction project_id: project, transaction_options: transaction_options
+          service.begin_transaction project_id: project, database_id: database, transaction_options: transaction_options
         end
 
         ##
@@ -112,17 +136,18 @@ module Google
         # some entities.
         def commit mutations, transaction: nil
           mode = transaction.nil? ? :NON_TRANSACTIONAL : :TRANSACTIONAL
-          service.commit project_id: project, mode: mode, mutations: mutations, transaction: transaction
+          service.commit project_id: project, database_id: database, mode: mode,
+                         mutations: mutations, transaction: transaction
         end
 
         ##
         # Roll back a transaction.
         def rollback transaction
-          service.rollback project_id: project, transaction: transaction
+          service.rollback project_id: project, database_id: database, transaction: transaction
         end
 
         def inspect
-          "#{self.class}(#{@project})"
+          "#{self.class}(#{@project})(#{database})"
         end
 
         protected

data/lib/google/cloud/datastore/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Datastore
-      VERSION = "2.3.1".freeze
+      VERSION = "2.5.0".freeze
     end
   end
 end

data/lib/google/cloud/datastore.rb

@@ -74,6 +74,8 @@ module Google
       #   If the param is nil, uses the default endpoint.
       # @param [String] emulator_host Datastore emulator host. Optional.
       #   If the param is nil, uses the value of the `emulator_host` config.
+      # @param [String] database_id Identifier for a Datastore database in the project. If not
+      #   present, the default database of the project will be used.
       # @param [String] project Alias for the `project_id` argument. Deprecated.
       # @param [String] keyfile Alias for the `credentials` argument.
       #   Deprecated.
@@ -103,13 +105,15 @@ module Google
                    timeout: nil,
                    endpoint: nil,
                    emulator_host: nil,
+                   database_id: nil,
                    project: nil,
                    keyfile: nil
-        project_id    ||= (project || default_project_id)
-        scope         ||= configure.scope
-        timeout       ||= configure.timeout
-        endpoint      ||= configure.endpoint
+        project_id = get_project_id project_id, project
+        scope ||= configure.scope
+        timeout ||= configure.timeout
+        endpoint ||= configure.endpoint
         emulator_host ||= configure.emulator_host
+        database_id ||= configure.database_id
 
         if emulator_host
           project_id = project_id.to_s # Always cast to a string
@@ -117,7 +121,7 @@ module Google
 
           return Datastore::Dataset.new(
             Datastore::Service.new(
-              project_id, :this_channel_is_insecure,
+              project_id, :this_channel_is_insecure, database_id,
               host: emulator_host, timeout: timeout
             )
           )
@@ -136,7 +140,7 @@ module Google
 
         Datastore::Dataset.new(
           Datastore::Service.new(
-            project_id, credentials,
+            project_id, credentials, database_id,
             host: endpoint, timeout: timeout
           )
         )
@@ -175,6 +179,14 @@ module Google
         Google::Cloud.configure.datastore
       end
 
+      ##
+      # @private Default project.
+      def self.get_project_id project_id, project
+        project_id || project || Google::Cloud.configure.datastore.project_id ||
+          Google::Cloud.configure.project_id ||
+          Google::Cloud.env.project_id
+      end
+
       ##
       # @private Default project.
       def self.default_project_id

data/lib/google-cloud-datastore.rb

@@ -67,9 +67,10 @@ module Google
     #   platform_scope = "https://www.googleapis.com/auth/cloud-platform"
     #   datastore = gcloud.datastore scope: platform_scope
     #
-    def datastore scope: nil, timeout: nil
+    def datastore scope: nil, timeout: nil, database_id: nil
       Google::Cloud.datastore @project, @keyfile,
-                              scope: scope, timeout: (timeout || @timeout)
+                              scope: scope, timeout: (timeout || @timeout),
+                              database_id: database_id
     end
 
     ##
@@ -112,11 +113,12 @@ module Google
     #   datastore.save task
     #
     def self.datastore project_id = nil, credentials = nil, scope: nil,
-                       timeout: nil
+                       timeout: nil, database_id: nil
       require "google/cloud/datastore"
       Google::Cloud::Datastore.new project_id: project_id,
                                    credentials: credentials,
-                                   scope: scope, timeout: timeout
+                                   scope: scope, timeout: timeout,
+                                   database_id: database_id
     end
   end
 end
@@ -136,8 +138,7 @@ Google::Cloud.configure.add_config! :datastore do |config|
     ENV["DATASTORE_EMULATOR_HOST"]
   end
   default_scopes = [
-    "https://www.googleapis.com/auth/cloud-platform",
-    "https://www.googleapis.com/auth/datastore"
+    "https://www.googleapis.com/auth/cloud-platform", "https://www.googleapis.com/auth/datastore"
   ]
 
   config.add_field! :project_id, default_project, match: String, allow_nil: true
@@ -149,4 +150,5 @@ Google::Cloud.configure.add_config! :datastore do |config|
   config.add_field! :timeout, nil, match: Integer
   config.add_field! :emulator_host, default_emulator, match: String, allow_nil: true
   config.add_field! :endpoint, "datastore.googleapis.com", match: String
+  config.add_field! :database_id, "", match: String
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-datastore
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -199,11 +199,13 @@ files:
 - TROUBLESHOOTING.md
 - lib/google-cloud-datastore.rb
 - lib/google/cloud/datastore.rb
+- lib/google/cloud/datastore/aggregate_query.rb
 - lib/google/cloud/datastore/commit.rb
 - lib/google/cloud/datastore/convert.rb
 - lib/google/cloud/datastore/credentials.rb
 - lib/google/cloud/datastore/cursor.rb
 - lib/google/cloud/datastore/dataset.rb
+- lib/google/cloud/datastore/dataset/aggregate_query_results.rb
 - lib/google/cloud/datastore/dataset/lookup_results.rb
 - lib/google/cloud/datastore/dataset/query_results.rb
 - lib/google/cloud/datastore/entity.rb
@@ -235,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.4.2
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Datastore