kura 0.4.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2333eaf23a195c96789fec8b1a9f2f7ecae62be3437c1c492d8afa00c1438203
-  data.tar.gz: 88895cb72f099b98481235903fe3145de8fa07e13b9eb7f12a9ef1b2023a769c
+  metadata.gz: 431faddd3518e447e4966d6eaf19e9ede9adb9ea6d4fb9d03a8715487021689d
+  data.tar.gz: f64c6c2fddcc66bde5cafca6b26a9f2e023f3627d9107fb69c23f3b15dbb41e7
 SHA512:
-  metadata.gz: b830c2859892d4283ab44f583676ba7da8c4f4dfede607a3d9e8d0cf08fd540c08c2c5f56d2d91f6b4d238934f5d4141557dd669f7a7df23ae737fb4183ec479
-  data.tar.gz: afa73e1709e3310287f64165b5551598c9055646e97c891f669c5cdee6239e615a31890ef232b818910bf49bf33191fed7acece362d36921d08d986cae9e1247
+  metadata.gz: 0bac5621aa3c792ce93b67b0238aa0e82fcef2ae72d2260d163c987b9f47a267f338b13fd34c6bb689e2c69d42419551c5fc96de3f147f1632a4e21298385231
+  data.tar.gz: cc903378660c1a9b080210c8f339d4cf4e574b197dbfd59b135f3dd94274e152884ccf2a5545c3610c3df531c783b44ae1b13774760a512d30fd3005907635af

data/ChangeLog.md

@@ -1,3 +1,39 @@
+# 0.6.1
+
+## Enhancements
+
+* `job` method now accept `fields` keyword argument.
+
+# 0.6.0
+
+## Changes
+
+* Replace runtime dependency "google-api-client.gem" -> "google-apis-bigquery_v2".
+  See https://github.com/groovenauts/gcs-ruby/pull/2://github.com/googleapis/google-api-ruby-client/blob/master/google-api-client/OVERVIEW.md for more details.
+
+# 0.5.0
+
+## Changes
+
+* `Kura::Client#list_tabledata` now return TIMESTAMP value in ISO 8601 format String.
+
+## Enhancements
+
+* Accept description field in schema specification at insert&load table.
+
+# 0.4.4
+
+## Enhancements
+
+* Support [Routines API](https://cloud.google.com/bigquery/docs/reference/rest/v2/routines/).
+
+# 0.4.3
+
+## Fixes
+
+* Query job with SCRIPT type could contain `status.errorResult` without `status.errors` property.
+  Fix to handle this case properly.
+
 # 0.4.2
 
 ## Enhancements

data/kura.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_runtime_dependency "google-api-client", [">= 0.28.6", "!= 0.29.1"]
+  spec.add_runtime_dependency "google-apis-bigquery_v2"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/kura/client.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require "time"
 require "json"
 require "google/apis/bigquery_v2"
 require "googleauth"
@@ -268,6 +269,8 @@ module Kura
         end
       when "BOOLEAN"
         x.to_s == "true"
+      when "TIMESTAMP"
+        Time.at(Float(x)).utc.iso8601(6)
       when "RECORD"
         _convert_tabledata_row(x, field_info["fields"])
       else
@@ -409,16 +412,16 @@ module Kura
               wait: nil,
               dry_run: false,
               &blk)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        query: Google::Apis::BigqueryV2::JobConfigurationQuery.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        query: Google::Apis::BigqueryV2::JobConfigurationQuery.new(
           query: sql,
           allow_large_results: normalize_parameter(allow_large_results),
           flatten_results: normalize_parameter(flatten_results),
           priority: priority,
           use_query_cache: normalize_parameter(use_query_cache),
           use_legacy_sql: use_legacy_sql,
-        })
-      })
+        )
+      )
       if mode
         configuration.query.write_disposition = mode_to_write_disposition(mode)
       end
@@ -433,15 +436,15 @@ module Kura
         configuration.query.maximum_bytes_billed = maximum_bytes_billed
       end
       if dataset_id and table_id
-        configuration.query.destination_table = Google::Apis::BigqueryV2::TableReference.new({ project_id: project_id, dataset_id: dataset_id, table_id: table_id })
+        configuration.query.destination_table = Google::Apis::BigqueryV2::TableReference.new(project_id: project_id, dataset_id: dataset_id, table_id: table_id)
       end
       if user_defined_function_resources
         configuration.query.user_defined_function_resources = Array(user_defined_function_resources).map do |r|
           r = r.to_s
           if r.start_with?("gs://")
-            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new({ resource_uri: r })
+            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new(resource_uri: r)
           else
-            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new({ inline_code: r })
+            Google::Apis::BigqueryV2::UserDefinedFunctionResource.new(inline_code: r)
           end
         end
       end
@@ -459,6 +462,9 @@ module Kura
             type: (s[:type] || s["type"]),
             mode: (s[:mode] || s["mode"]),
           }
+          if (desc = (s[:description] || s["description"]))
+            f[:description] = desc
+          end
           if (sub_fields = (s[:fields] || s["fields"]))
             f[:fields] = normalize_schema(sub_fields)
           end
@@ -468,6 +474,9 @@ module Kura
             type: s.type,
             mode: s.mode,
           }
+          if s.respond_to?(:description)
+            f[:description] = s.description
+          end
           if (sub_fields = s.fields)
             f[:fields] = normalize_schema(sub_fields)
           end
@@ -493,26 +502,26 @@ module Kura
              &blk)
       write_disposition = mode_to_write_disposition(mode)
       source_uris = [source_uris] if source_uris.is_a?(String)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        load: Google::Apis::BigqueryV2::JobConfigurationLoad.new({
-          destination_table: Google::Apis::BigqueryV2::TableReference.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        load: Google::Apis::BigqueryV2::JobConfigurationLoad.new(
+          destination_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: project_id,
             dataset_id: dataset_id,
             table_id: table_id,
-          }),
+          ),
           write_disposition: write_disposition,
           allow_jagged_rows: normalize_parameter(allow_jagged_rows),
           max_bad_records: max_bad_records,
           ignore_unknown_values: normalize_parameter(ignore_unknown_values),
           source_format: source_format,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
       end
       if schema
-        configuration.load.schema = Google::Apis::BigqueryV2::TableSchema.new({ fields: normalize_schema(schema) })
+        configuration.load.schema = Google::Apis::BigqueryV2::TableSchema.new(fields: normalize_schema(schema))
       end
       if source_format == "CSV"
         configuration.load.field_delimiter = field_delimiter
@@ -541,18 +550,18 @@ module Kura
                 dry_run: false,
                 &blk)
       dest_uris = [ dest_uris ] if dest_uris.is_a?(String)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        extract: Google::Apis::BigqueryV2::JobConfigurationExtract.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        extract: Google::Apis::BigqueryV2::JobConfigurationExtract.new(
           compression: compression,
           destination_format: destination_format,
-          source_table: Google::Apis::BigqueryV2::TableReference.new({
+          source_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: project_id,
             dataset_id: dataset_id,
             table_id: table_id,
-          }),
+          ),
           destination_uris: dest_uris,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
@@ -574,21 +583,21 @@ module Kura
              dry_run: false,
              &blk)
       write_disposition = mode_to_write_disposition(mode)
-      configuration = Google::Apis::BigqueryV2::JobConfiguration.new({
-        copy: Google::Apis::BigqueryV2::JobConfigurationTableCopy.new({
-          destination_table: Google::Apis::BigqueryV2::TableReference.new({
+      configuration = Google::Apis::BigqueryV2::JobConfiguration.new(
+        copy: Google::Apis::BigqueryV2::JobConfigurationTableCopy.new(
+          destination_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: dest_project_id,
             dataset_id: dest_dataset_id,
             table_id: dest_table_id,
-          }),
-          source_table: Google::Apis::BigqueryV2::TableReference.new({
+          ),
+          source_table: Google::Apis::BigqueryV2::TableReference.new(
             project_id: src_project_id,
             dataset_id: src_dataset_id,
             table_id: src_table_id,
-          }),
+          ),
           write_disposition: write_disposition,
-        })
-      })
+        )
+      )
       if dry_run
         configuration.dry_run = true
         wait = nil
@@ -617,14 +626,14 @@ module Kura
         state_filter: state_filter)
     end
 
-    def job(job_id, location: nil, project_id: @default_project_id, &blk)
+    def job(job_id, location: nil, project_id: @default_project_id, fields: nil, &blk)
       if blk
-        @api.get_job(project_id, job_id, location: location) do |j, e|
+        @api.get_job(project_id, job_id, location: location, fields: fields) do |j, e|
           j.kura_api = self if j
           blk.call(j, e)
         end
       else
-        @api.get_job(project_id, job_id, location: location).tap{|j| j.kura_api = self if j }
+        @api.get_job(project_id, job_id, location: location, fields: fields).tap{|j| j.kura_api = self if j }
       end
     rescue
       process_error($!)
@@ -654,13 +663,21 @@ module Kura
     def job_finished?(r)
       if r.status.state == "DONE"
         if r.status.error_result
-          raise Kura::ApiError.new(r.status.errors.map(&:reason).join(","),
-                                   r.status.errors.map{|e|
-                                     msg = "reason=#{e.reason} message=#{e.message}"
-                                     msg += " location=#{e.location}" if e.location
-                                     msg += " debug_infoo=#{e.debug_info}" if e.debug_info
-                                     msg
-                                   }.join("\n"))
+          if r.status.errors
+            raise Kura::ApiError.new(r.status.errors.map(&:reason).join(","),
+                                     r.status.errors.map{|e|
+              msg = "reason=#{e.reason} message=#{e.message}"
+              msg += " location=#{e.location}" if e.location
+              msg += " debug_info=#{e.debug_info}" if e.debug_info
+              msg
+            }.join("\n"))
+          else
+            e = r.status.error_result
+            msg = "reason=#{e.reason} message=#{e.message}"
+            msg += " location=#{e.location}" if e.location
+            msg += " debug_info=#{e.debug_info}" if e.debug_info
+            raise Kura::ApiError.new(e.reason, msg)
+          end
         end
         return true
       end
@@ -729,5 +746,72 @@ module Kura
       return nil if $!.respond_to?(:status_code) and $!.status_code == 404
       process_error($!)
     end
+
+    # Routines API
+    def routines(dataset_id, project_id: @default_project_id, limit: 1000, page_token: nil, &blk)
+      if blk
+        @api.list_routines(project_id, dataset_id, max_results: limit, page_token: page_token) do |result, err|
+          result &&= (result.routines || [])
+          blk.call(result, err)
+        end
+      else
+        @api.list_routines(project_id, dataset_id, max_results: limit, page_token: page_token)
+      end
+    rescue
+      process_error($!)
+    end
+
+    def routine(dataset_id, routine_id, project_id: @default_project_id, &blk)
+      if blk
+        @api.get_routine(project_id, dataset_id, routine_id) do |result, err|
+          if err.respond_to?(:status_code) and err.status_code == 404
+            result = nil
+            err = nil
+          end
+          blk.call(result, err)
+        end
+      else
+        @api.get_routine(project_id, dataset_id, routine_id)
+      end
+    rescue
+      return nil if $!.respond_to?(:status_code) and $!.status_code == 404
+      process_error($!)
+    end
+
+    def delete_routine(dataset_id, routine_id, project_id: @default_project_id, &blk)
+      @api.delete_routine(project_id, dataset_id, routine_id, &blk)
+    rescue
+      return nil if $!.respond_to?(:status_code) and $!.status_code == 404
+      process_error($!)
+    end
+
+    def insert_routine(dataset_id,
+                       routine_id,
+                       body,
+                       project_id: @default_project_id,
+                       routine_type: "PROCEDURE",
+                       language: "SQL",
+                       arguments: [],
+                       return_type: nil,
+                       imported_libraries: [],
+                       description: nil)
+      @api.insert_routine(
+        project_id,
+        dataset_id,
+        Google::Apis::BigqueryV2::Routine.new(
+          routine_reference: Google::Apis::BigqueryV2::RoutineReference.new(
+            project_id: project_id,
+            dataset_id: dataset_id,
+            routine_id: routine_id
+          ),
+          arguments: arguments,
+          definition_body: body,
+          imported_libraries: imported_libraries,
+          language: language,
+          return_type: return_type,
+          routine_type: routine_type,
+          description: description
+        ))
+    end
   end
 end

data/lib/kura/version.rb

@@ -1,3 +1,3 @@
 module Kura
-  VERSION = "0.4.2"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kura
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Chikanaga Tomoyuki
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-bigquery_v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.28.6
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +133,7 @@ homepage: https://github.com/nagachika/kura/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,8 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Interface to BigQuery API v2.
 test_files: []