google-cloud-bigquery 0.21.0 → 0.23.0

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

@@ -98,6 +98,20 @@ module Google
                          table.table_id
         end
 
+        ##
+        # Checks if the query job is using legacy sql.
+        def legacy_sql?
+          val = @gapi.configuration.query.use_legacy_sql
+          return true if val.nil?
+          val
+        end
+
+        ##
+        # Checks if the query job is using standard sql.
+        def standard_sql?
+          !legacy_sql?
+        end
+
         ##
         # Retrieves the query results for the job.
         #

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

@@ -19,6 +19,7 @@ require "google/apis/bigquery_v2"
 require "pathname"
 require "digest/md5"
 require "mime/types"
+require "date"
 
 module Google
   module Cloud
@@ -380,12 +381,14 @@ module Google
           )
         end
 
+        # rubocop:disable all
+
         ##
         # Job description for query job
         def query_table_config query, options
           dest_table = table_ref_from options[:table]
           default_dataset = dataset_ref_from options[:dataset]
-          API::Job.new(
+          req = API::Job.new(
             configuration: API::JobConfiguration.new(
               query: API::JobConfigurationQuery.new(
                 query: query,
@@ -397,23 +400,168 @@ module Google
                 write_disposition: write_disposition(options[:write]),
                 allow_large_results: options[:large_results],
                 flatten_results: options[:flatten],
-                default_dataset: default_dataset
+                default_dataset: default_dataset,
+                use_legacy_sql: resolve_legacy_sql(options[:legacy_sql],
+                                                   options[:standard_sql])
               )
             )
           )
+
+          if options[:params]
+            if Array === options[:params]
+              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
+              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|
+                  named_param.name = String name
+                end
+              end
+            else
+              fail "Query parameters must be an Array or a Hash."
+            end
+          end
+
+          req
         end
 
         def query_config query, options = {}
           dataset_config = dataset_ref_from options[:dataset], options[:project]
 
-          API::QueryRequest.new(
+          req = API::QueryRequest.new(
             query: query,
             max_results: options[:max],
             default_dataset: dataset_config,
             timeout_ms: options[:timeout],
             dry_run: options[:dryrun],
-            use_query_cache: options[:cache]
+            use_query_cache: options[:cache],
+            use_legacy_sql: resolve_legacy_sql(options[:legacy_sql],
+                                               options[:standard_sql])
           )
+
+          if options[:params]
+            if Array === options[:params]
+              req.use_legacy_sql = false
+              req.parameter_mode = "POSITIONAL"
+              req.query_parameters = options[:params].map do |param|
+                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|
+                  named_param.name = String name
+                end
+              end
+            else
+              fail "Query parameters must be an Array or a Hash."
+            end
+          end
+
+          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
 
         ##

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

@@ -247,7 +247,7 @@ module Google
         def created_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.creation_time) / 1000.0)
+            ::Time.at(Integer(@gapi.creation_time) / 1000.0)
           rescue
             nil
           end
@@ -263,7 +263,7 @@ module Google
         def expires_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.expiration_time) / 1000.0)
+            ::Time.at(Integer(@gapi.expiration_time) / 1000.0)
           rescue
             nil
           end
@@ -277,7 +277,7 @@ module Google
         def modified_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.last_modified_time) / 1000.0)
+            ::Time.at(Integer(@gapi.last_modified_time) / 1000.0)
           rescue
             nil
           end

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

@@ -0,0 +1,59 @@
+# Copyright 2016 Google Inc. All rights reserved.
+#
+# 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
+#
+#     http://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 Bigquery
+      ##
+      # # Time
+      #
+      # A TIME data type represents a time, independent of a specific date.
+      #
+      # @attr_writer [String] value The BigQuery TIME.
+      #
+      # @example
+      #   require "google/cloud/bigquery"
+      #
+      #   bigquery = Google::Cloud::Bigquery.new
+      #
+      #   fourpm = Google::Cloud::Bigquery::Time.new "16:00:00"
+      #   data = bigquery.query "SELECT name " \
+      #                         "FROM [my_proj:my_data.my_table]" \
+      #                         "WHERE time_of_date = @time",
+      #                         params: { time: fourpm }
+      #
+      #   data.each do |row|
+      #     puts row["name"]
+      #   end
+      #
+      # @example Create Time with fractional seconds:
+      #   require "google/cloud/bigquery"
+      #
+      #   bigquery = Google::Cloud::Bigquery.new
+      #
+      #   precise_time = Google::Cloud::Bigquery::Time.new "16:35:15.376541"
+      #   data = bigquery.query "SELECT name " \
+      #                         "FROM [my_proj:my_data.my_table]" \
+      #                         "WHERE time_of_date >= @time",
+      #                         params: { time: precise_time }
+      #
+      #   data.each do |row|
+      #     puts row["name"]
+      #   end
+      #
+      Time = Struct.new :value
+    end
+  end
+end

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

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

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

@@ -120,9 +120,9 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #   dataset = bigquery.dataset "my_dataset"
-        #   table = dataset.table "my_table"
+        #   view = dataset.table "my_view"
         #
-        #   data = bigquery.query "SELECT name FROM #{table.query_id}"
+        #   data = bigquery.query "SELECT name FROM #{view.query_id}"
         #
         # @!group Attributes
         #
@@ -197,7 +197,7 @@ module Google
         def created_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.creation_time) / 1000.0)
+            ::Time.at(Integer(@gapi.creation_time) / 1000.0)
           rescue
             nil
           end
@@ -213,7 +213,7 @@ module Google
         def expires_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.expiration_time) / 1000.0)
+            ::Time.at(Integer(@gapi.expiration_time) / 1000.0)
           rescue
             nil
           end
@@ -227,7 +227,7 @@ module Google
         def modified_at
           ensure_full_data!
           begin
-            Time.at(Integer(@gapi.last_modified_time) / 1000.0)
+            ::Time.at(Integer(@gapi.last_modified_time) / 1000.0)
           rescue
             nil
           end
@@ -385,9 +385,9 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #   dataset = bigquery.dataset "my_dataset"
-        #   table = dataset.table "my_table"
+        #   view = dataset.table "my_view"
         #
-        #   table.delete
+        #   view.delete
         #
         # @!group Lifecycle
         #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-bigquery
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.11
+        version: 0.9.18
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.8
 description: google-cloud-bigquery is the official library for Google BigQuery.
 email:
 - mike@blowmage.com
@@ -173,6 +173,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- LICENSE
+- README.md
 - lib/google-cloud-bigquery.rb
 - lib/google/cloud/bigquery.rb
 - lib/google/cloud/bigquery/copy_job.rb
@@ -194,6 +197,7 @@ files:
 - lib/google/cloud/bigquery/service.rb
 - lib/google/cloud/bigquery/table.rb
 - lib/google/cloud/bigquery/table/list.rb
+- lib/google/cloud/bigquery/time.rb
 - lib/google/cloud/bigquery/version.rb
 - lib/google/cloud/bigquery/view.rb
 homepage: http://googlecloudplatform.github.io/google-cloud-ruby/
@@ -216,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: API Client library for Google BigQuery