google-cloud-bigquery 0.23.0 → 0.24.0

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

@@ -14,6 +14,7 @@
 
 
 require "google/cloud/bigquery/version"
+require "google/cloud/bigquery/convert"
 require "google/cloud/errors"
 require "google/apis/bigquery_v2"
 require "pathname"
@@ -171,8 +172,7 @@ module Google
         def insert_tabledata dataset_id, table_id, rows, options = {}
           insert_rows = Array(rows).map do |row|
             Google::Apis::BigqueryV2::InsertAllTableDataRequest::Row.new(
-              insert_id: Digest::MD5.base64digest(row.inspect),
-              # Hash[row.map{|(k,v)| [k.to_s,v]}] for Hash<String,Object>
+              insert_id: Digest::MD5.base64digest(row.to_json),
               json: row
             )
           end
@@ -401,8 +401,9 @@ module Google
                 allow_large_results: options[:large_results],
                 flatten_results: options[:flatten],
                 default_dataset: default_dataset,
-                use_legacy_sql: resolve_legacy_sql(options[:legacy_sql],
-                                                   options[:standard_sql])
+                use_legacy_sql: Convert.resolve_legacy_sql(
+                  options[:standard_sql], options[:legacy_sql])
+
               )
             )
           )
@@ -412,13 +413,13 @@ module Google
               req.configuration.query.use_legacy_sql = false
               req.configuration.query.parameter_mode = "POSITIONAL"
               req.configuration.query.query_parameters = options[:params].map do |param|
-                to_query_param param
+                Convert.to_query_param param
               end
             elsif Hash === options[:params]
               req.configuration.query.use_legacy_sql = false
               req.configuration.query.parameter_mode = "NAMED"
               req.configuration.query.query_parameters = options[:params].map do |name, param|
-                to_query_param(param).tap do |named_param|
+                Convert.to_query_param(param).tap do |named_param|
                   named_param.name = String name
                 end
               end
@@ -440,8 +441,8 @@ module Google
             timeout_ms: options[:timeout],
             dry_run: options[:dryrun],
             use_query_cache: options[:cache],
-            use_legacy_sql: resolve_legacy_sql(options[:legacy_sql],
-                                               options[:standard_sql])
+            use_legacy_sql: Convert.resolve_legacy_sql(
+              options[:standard_sql], options[:legacy_sql])
           )
 
           if options[:params]
@@ -449,13 +450,13 @@ module Google
               req.use_legacy_sql = false
               req.parameter_mode = "POSITIONAL"
               req.query_parameters = options[:params].map do |param|
-                to_query_param param
+                Convert.to_query_param param
               end
             elsif Hash === options[:params]
               req.use_legacy_sql = false
               req.parameter_mode = "NAMED"
               req.query_parameters = options[:params].map do |name, param|
-                to_query_param(param).tap do |named_param|
+                Convert.to_query_param(param).tap do |named_param|
                   named_param.name = String name
                 end
               end
@@ -467,103 +468,8 @@ module Google
           req
         end
 
-        def to_query_param value
-          if TrueClass === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "BOOL"),
-              parameter_value: API::QueryParameterValue.new(value: true)
-            )
-          elsif FalseClass === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "BOOL"),
-              parameter_value: API::QueryParameterValue.new(value: false)
-            )
-          elsif Integer === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "INT64"),
-              parameter_value: API::QueryParameterValue.new(value: value)
-            )
-          elsif Float === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "FLOAT64"),
-              parameter_value: API::QueryParameterValue.new(value: value)
-            )
-          elsif String === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "STRING"),
-              parameter_value: API::QueryParameterValue.new(value: value)
-            )
-          elsif DateTime === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "DATETIME"),
-              parameter_value: API::QueryParameterValue.new(
-                value: value.strftime("%Y-%m-%d %H:%M:%S.%6N"))
-            )
-          elsif Date === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "DATE"),
-              parameter_value: API::QueryParameterValue.new(value: value.to_s)
-            )
-          elsif ::Time === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "TIMESTAMP"),
-              parameter_value: API::QueryParameterValue.new(
-                value: value.strftime("%Y-%m-%d %H:%M:%S.%6N%:z"))
-            )
-          elsif Bigquery::Time === value
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "TIME"),
-              parameter_value: API::QueryParameterValue.new(value: value.value)
-            )
-          elsif value.respond_to?(:read) && value.respond_to?(:rewind)
-            value.rewind
-            return API::QueryParameter.new(
-              parameter_type:  API::QueryParameterType.new(type: "BYTES"),
-              parameter_value: API::QueryParameterValue.new(
-                value: value.read.force_encoding("ASCII-8BIT"))
-            )
-          elsif Array === value
-            array_params = value.map { |param| to_query_param param }
-            return API::QueryParameter.new(
-              parameter_type: API::QueryParameterType.new(
-                type: "ARRAY",
-                array_type: array_params.first.parameter_type
-              ),
-              parameter_value: API::QueryParameterValue.new(
-                array_values: array_params.map(&:parameter_value)
-              )
-            )
-          elsif Hash === value
-            struct_pairs = value.map do |name, param|
-              struct_param = to_query_param param
-              [API::QueryParameterType::StructType.new(
-                name: String(name),
-                type: struct_param.parameter_type
-              ), struct_param.parameter_value]
-            end
-
-            return API::QueryParameter.new(
-              parameter_type: API::QueryParameterType.new(
-                type: "STRUCT",
-                struct_types: struct_pairs.map(&:first)
-              ),
-              parameter_value: API::QueryParameterValue.new(
-                struct_values: struct_pairs.map(&:last)
-              )
-            )
-          else
-            fail "A query parameter of type #{value.class} is not supported."
-          end
-          v
-        end
-
         # rubocop:enable all
 
-        def resolve_legacy_sql legacy_sql, standard_sql
-          return legacy_sql unless legacy_sql.nil?
-          return !standard_sql unless standard_sql.nil?
-        end
-
         ##
         # Job description for copy job
         def copy_table_config source, target, options = {}

data/lib/google/cloud/bigquery/table.rb

@@ -120,7 +120,7 @@ module Google
 
         ##
         # The combined Project ID, Dataset ID, and Table ID for this table, in
-        # the format specified by the [Query
+        # the format specified by the [Legacy SQL Query
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # `project_name:datasetId.tableId`. To use this value in queries see
         # {#query_id}.
@@ -137,6 +137,15 @@ module Google
         # Reference](https://cloud.google.com/bigquery/query-reference#from).
         # Useful in queries.
         #
+        # @param [Boolean] standard_sql Specifies whether to use BigQuery's
+        #   [standard
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/)
+        #   dialect. Optional. The default value is true.
+        # @param [Boolean] legacy_sql Specifies whether to use BigQuery's
+        #   [legacy
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql)
+        #   dialect. Optional. The default value is false.
+        #
         # @example
         #   require "google/cloud/bigquery"
         #
@@ -148,8 +157,12 @@ module Google
         #
         # @!group Attributes
         #
-        def query_id
-          project_id["-"] ? "[#{id}]" : id
+        def query_id standard_sql: nil, legacy_sql: nil
+          if Convert.resolve_legacy_sql standard_sql, legacy_sql
+            "[#{id}]"
+          else
+            "`#{project_id}.#{dataset_id}.#{table_id}`"
+          end
         end
 
         ##
@@ -354,7 +367,6 @@ module Google
               schema_builder = Schema.from_gapi empty_schema
             end
             yield schema_builder
-            schema_builder.check_for_mutated_schema!
             if schema_builder.changed?
               @gapi.schema = schema_builder.to_gapi
               patch_gapi! :schema
@@ -378,7 +390,7 @@ module Google
         # @!group Attributes
         #
         def headers
-          fields.map(&:name)
+          schema.headers
         end
 
         ##
@@ -713,6 +725,7 @@ module Google
         #
         def insert rows, skip_invalid: nil, ignore_unknown: nil
           rows = [rows] if rows.is_a? Hash
+          rows = Convert.to_json_rows rows
           ensure_service!
           options = { skip_invalid: skip_invalid,
                       ignore_unknown: ignore_unknown }
@@ -1019,6 +1032,34 @@ module Google
             schema.boolean name, description: description, mode: mode
           end
 
+          ##
+          # Adds a bytes field to the schema.
+          #
+          # See {Schema#bytes}.
+          #
+          # @param [String] name The field name. The name must contain only
+          #   letters (a-z, A-Z), numbers (0-9), or underscores (_), and must
+          #   start with a letter or underscore. The maximum length is 128
+          #   characters.
+          # @param [String] description A description of the field.
+          # @param [Symbol] mode The field's mode. The possible values are
+          #   `:nullable`, `:required`, and `:repeated`. The default value is
+          #   `:nullable`.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   table = dataset.create_table "my_table" do |schema|
+          #     schema.bytes "avatar", mode: :required
+          #   end
+          #
+          # @!group Schema
+          def bytes name, description: nil, mode: :nullable
+            schema.bytes name, description: description, mode: mode
+          end
+
           ##
           # Adds a timestamp field to the schema.
           #
@@ -1047,6 +1088,90 @@ module Google
             schema.timestamp name, description: description, mode: mode
           end
 
+          ##
+          # Adds a time field to the schema.
+          #
+          # See {Schema#time}.
+          #
+          # @param [String] name The field name. The name must contain only
+          #   letters (a-z, A-Z), numbers (0-9), or underscores (_), and must
+          #   start with a letter or underscore. The maximum length is 128
+          #   characters.
+          # @param [String] description A description of the field.
+          # @param [Symbol] mode The field's mode. The possible values are
+          #   `:nullable`, `:required`, and `:repeated`. The default value is
+          #   `:nullable`.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   table = dataset.create_table "my_table" do |schema|
+          #     schema.time "duration", mode: :required
+          #   end
+          #
+          # @!group Schema
+          def time name, description: nil, mode: :nullable
+            schema.time name, description: description, mode: mode
+          end
+
+          ##
+          # Adds a datetime field to the schema.
+          #
+          # See {Schema#datetime}.
+          #
+          # @param [String] name The field name. The name must contain only
+          #   letters (a-z, A-Z), numbers (0-9), or underscores (_), and must
+          #   start with a letter or underscore. The maximum length is 128
+          #   characters.
+          # @param [String] description A description of the field.
+          # @param [Symbol] mode The field's mode. The possible values are
+          #   `:nullable`, `:required`, and `:repeated`. The default value is
+          #   `:nullable`.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   table = dataset.create_table "my_table" do |schema|
+          #     schema.datetime "target_end", mode: :required
+          #   end
+          #
+          # @!group Schema
+          def datetime name, description: nil, mode: :nullable
+            schema.datetime name, description: description, mode: mode
+          end
+
+          ##
+          # Adds a date field to the schema.
+          #
+          # See {Schema#date}.
+          #
+          # @param [String] name The field name. The name must contain only
+          #   letters (a-z, A-Z), numbers (0-9), or underscores (_), and must
+          #   start with a letter or underscore. The maximum length is 128
+          #   characters.
+          # @param [String] description A description of the field.
+          # @param [Symbol] mode The field's mode. The possible values are
+          #   `:nullable`, `:required`, and `:repeated`. The default value is
+          #   `:nullable`.
+          #
+          # @example
+          #   require "google/cloud/bigquery"
+          #
+          #   bigquery = Google::Cloud::Bigquery.new
+          #   dataset = bigquery.dataset "my_dataset"
+          #   table = dataset.create_table "my_table" do |schema|
+          #     schema.date "birthday", mode: :required
+          #   end
+          #
+          # @!group Schema
+          def date name, description: nil, mode: :nullable
+            schema.date name, description: description, mode: mode
+          end
+
           ##
           # Adds a record field to the schema. A block must be passed describing
           # the nested fields of the record. For more information about nested
@@ -1089,7 +1214,6 @@ module Google
           # Make sure any access changes are saved
           def check_for_mutated_schema!
             return if @schema.nil?
-            @schema.check_for_mutated_schema!
             return unless @schema.changed?
             @gapi.schema = @schema.to_gapi
             patch_gapi! :schema

data/lib/google/cloud/bigquery/time.rb

@@ -30,7 +30,7 @@ module Google
       #
       #   fourpm = Google::Cloud::Bigquery::Time.new "16:00:00"
       #   data = bigquery.query "SELECT name " \
-      #                         "FROM [my_proj:my_data.my_table]" \
+      #                         "FROM `my_proj.my_data.my_table`" \
       #                         "WHERE time_of_date = @time",
       #                         params: { time: fourpm }
       #
@@ -45,7 +45,7 @@ module Google
       #
       #   precise_time = Google::Cloud::Bigquery::Time.new "16:35:15.376541"
       #   data = bigquery.query "SELECT name " \
-      #                         "FROM [my_proj:my_data.my_table]" \
+      #                         "FROM `my_proj.my_data.my_table`" \
       #                         "WHERE time_of_date >= @time",
       #                         params: { time: precise_time }
       #

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Bigquery
-      VERSION = "0.23.0"
+      VERSION = "0.24.0"
     end
   end
 end

data/lib/google/cloud/bigquery/view.rb

@@ -40,7 +40,7 @@ module Google
       #   bigquery = Google::Cloud::Bigquery.new
       #   dataset = bigquery.dataset "my_dataset"
       #   view = dataset.create_view "my_view",
-      #            "SELECT name, age FROM [proj:dataset.users]"
+      #            "SELECT name, age FROM proj.dataset.users"
       #
       class View
         ##
@@ -98,7 +98,7 @@ module Google
 
         ##
         # The combined Project ID, Dataset ID, and Table ID for this table, in
-        # the format specified by the [Query
+        # the format specified by the [Legacy SQL Query
         # Reference](https://cloud.google.com/bigquery/query-reference#from):
         # `project_name:datasetId.tableId`. To use this value in queries see
         # {#query_id}.
@@ -115,6 +115,15 @@ module Google
         # Reference](https://cloud.google.com/bigquery/query-reference#from).
         # Useful in queries.
         #
+        # @param [Boolean] standard_sql Specifies whether to use BigQuery's
+        #   [standard
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/)
+        #   dialect. Optional. The default value is true.
+        # @param [Boolean] legacy_sql Specifies whether to use BigQuery's
+        #   [legacy
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql)
+        #   dialect. Optional. The default value is false.
+        #
         # @example
         #   require "google/cloud/bigquery"
         #
@@ -126,8 +135,12 @@ module Google
         #
         # @!group Attributes
         #
-        def query_id
-          project_id["-"] ? "[#{id}]" : id
+        def query_id standard_sql: nil, legacy_sql: nil
+          if Convert.resolve_legacy_sql standard_sql, legacy_sql
+            "[#{id}]"
+          else
+            "`#{project_id}.#{dataset_id}.#{table_id}`"
+          end
         end
 
         ##
@@ -287,7 +300,7 @@ module Google
         # @!group Attributes
         #
         def headers
-          fields.map(&:name)
+          schema.headers
         end
 
         ##
@@ -306,6 +319,14 @@ module Google
         #   Reference
         #
         # @param [String] new_query The query that defines the view.
+        # @param [Boolean] standard_sql Specifies whether to use BigQuery's
+        #   [standard
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/standard-sql/)
+        #   dialect. Optional. The default value is true.
+        # @param [Boolean] legacy_sql Specifies whether to use BigQuery's
+        #   [legacy
+        #   SQL](https://cloud.google.com/bigquery/docs/reference/legacy-sql)
+        #   dialect. Optional. The default value is false.
         #
         # @example
         #   require "google/cloud/bigquery"
@@ -315,13 +336,15 @@ module Google
         #   view = dataset.table "my_view"
         #
         #   view.query = "SELECT first_name FROM " \
-        #                "[my_project:my_dataset.my_table]"
+        #                "`my_project.my_dataset.my_table`"
         #
         # @!group Lifecycle
         #
-        def query= new_query
+        def query= new_query, standard_sql: nil, legacy_sql: nil
           @gapi.view ||= Google::Apis::BigqueryV2::ViewDefinition.new
           @gapi.view.update! query: new_query
+          @gapi.view.update! use_legacy_sql: \
+            Convert.resolve_legacy_sql(standard_sql, legacy_sql)
           patch_view_gapi! :query
         end
 
@@ -426,6 +449,12 @@ module Google
           fail "Must have active connection" unless service
         end
 
+        def resolve_legacy_sql legacy_sql, standard_sql
+          return legacy_sql unless legacy_sql.nil?
+          return !standard_sql unless standard_sql.nil?
+          false
+        end
+
         def patch_gapi! *attributes
           return if attributes.empty?
           patch_args = Hash[attributes.map do |attr|