google-cloud-bigquery 1.0.0 → 1.1.0

data/lib/google/cloud/bigquery/dataset/list.rb

@@ -159,7 +159,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active connection" unless @service
+            raise "Must have active connection" unless @service
           end
         end
       end

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

@@ -55,7 +55,7 @@ module Google
         def self.from_urls urls, format = nil
           external_format = source_format_for urls, format
           if external_format.nil?
-            fail ArgumentError, "Unable to determine external table format"
+            raise ArgumentError, "Unable to determine external table format"
           end
           external_class = table_class_for external_format
           external_class.new.tap do |e|
@@ -70,7 +70,7 @@ module Google
           external_format = source_format_for gapi.source_uris,
                                               gapi.source_format
           if external_format.nil?
-            fail ArgumentError, "Unable to determine external table format"
+            raise ArgumentError, "Unable to determine external table format"
           end
           external_class = table_class_for external_format
           external_class.from_gapi gapi
@@ -79,17 +79,17 @@ module Google
         ##
         # @private Determine source_format from inputs
         def self.source_format_for urls, format
-          val = { "csv"                    => "CSV",
-                  "json"                   => "NEWLINE_DELIMITED_JSON",
-                  "newline_delimited_json" => "NEWLINE_DELIMITED_JSON",
-                  "sheets"                 => "GOOGLE_SHEETS",
-                  "google_sheets"          => "GOOGLE_SHEETS",
-                  "avro"                   => "AVRO",
-                  "datastore"              => "DATASTORE_BACKUP",
-                  "backup"                 => "DATASTORE_BACKUP",
-                  "datastore_backup"       => "DATASTORE_BACKUP",
-                  "bigtable"               => "BIGTABLE"
-                }[format.to_s.downcase]
+          val = {
+            "csv" => "CSV",          "avro" => "AVRO",
+            "json"                   => "NEWLINE_DELIMITED_JSON",
+            "newline_delimited_json" => "NEWLINE_DELIMITED_JSON",
+            "sheets"                 => "GOOGLE_SHEETS",
+            "google_sheets"          => "GOOGLE_SHEETS",
+            "datastore"              => "DATASTORE_BACKUP",
+            "backup"                 => "DATASTORE_BACKUP",
+            "datastore_backup"       => "DATASTORE_BACKUP",
+            "bigtable"               => "BIGTABLE"
+          }[format.to_s.downcase]
           return val unless val.nil?
           Array(urls).each do |url|
             return "CSV" if url.end_with? ".csv"
@@ -556,7 +556,8 @@ module Google
 
           def frozen_check!
             return unless frozen?
-            fail ArgumentError, "Cannot modify external data source when frozen"
+            raise ArgumentError,
+                  "Cannot modify external data source when frozen"
           end
         end
 
@@ -1426,7 +1427,8 @@ module Google
 
           def frozen_check!
             return unless frozen?
-            fail ArgumentError, "Cannot modify external data source when frozen"
+            raise ArgumentError,
+                  "Cannot modify external data source when frozen"
           end
 
           ##
@@ -1964,8 +1966,8 @@ module Google
 
             def frozen_check!
               return unless frozen?
-              fail ArgumentError,
-                   "Cannot modify external data source when frozen"
+              raise ArgumentError,
+                    "Cannot modify external data source when frozen"
             end
           end
 
@@ -2064,7 +2066,7 @@ module Google
             #
             def qualifier= new_qualifier
               frozen_check!
-              fail ArgumentError if new_qualifier.nil?
+              raise ArgumentError if new_qualifier.nil?
 
               utf8_qualifier = new_qualifier.encode Encoding::UTF_8
               if utf8_qualifier.valid_encoding?
@@ -2342,8 +2344,8 @@ module Google
 
             def frozen_check!
               return unless frozen?
-              fail ArgumentError,
-                   "Cannot modify external data source when frozen"
+              raise ArgumentError,
+                    "Cannot modify external data source when frozen"
             end
           end
         end

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

@@ -60,7 +60,6 @@ module Google
           error_count.zero?
         end
 
-
         ##
         # The count of rows in the response, minus the count of errors for rows
         # that were not inserted.
@@ -71,7 +70,6 @@ module Google
           @rows.count - error_count
         end
 
-
         ##
         # The count of errors for rows that were not inserted.
         #

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

@@ -44,7 +44,7 @@ module Google
       #   bigquery = Google::Cloud::Bigquery.new
       #
       #   job = bigquery.query_job "SELECT COUNT(word) as count FROM " \
-      #                            "publicdata.samples.shakespeare"
+      #                            "`bigquery-public-data.samples.shakespeare`"
       #
       #   job.wait_until_done!
       #
@@ -162,7 +162,7 @@ module Google
         #
         def created_at
           ::Time.at(Integer(@gapi.statistics.creation_time) / 1000.0)
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -175,7 +175,7 @@ module Google
         #
         def started_at
           ::Time.at(Integer(@gapi.statistics.start_time) / 1000.0)
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -187,7 +187,7 @@ module Google
         #
         def ended_at
           ::Time.at(Integer(@gapi.statistics.end_time) / 1000.0)
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -199,7 +199,7 @@ module Google
         def configuration
           JSON.parse @gapi.configuration.to_json
         end
-        alias_method :config, :configuration
+        alias config configuration
 
         ##
         # The statistics for the job. Returns a hash.
@@ -212,7 +212,7 @@ module Google
         def statistics
           JSON.parse @gapi.statistics.to_json
         end
-        alias_method :stats, :statistics
+        alias stats statistics
 
         ##
         # The job's status. Returns a hash. The values contained in the hash are
@@ -236,7 +236,7 @@ module Google
         #
         #   {
         #     "reason"=>"notFound",
-        #     "message"=>"Not found: Table publicdata:samples.BAD_ID"
+        #     "message"=>"Not found: Table bigquery-public-data:samples.BAD_ID"
         #   }
         #
         def error
@@ -252,7 +252,7 @@ module Google
         #
         #   {
         #     "reason"=>"notFound",
-        #     "message"=>"Not found: Table publicdata:samples.BAD_ID"
+        #     "message"=>"Not found: Table bigquery-public-data:samples.BAD_ID"
         #   }
         #
         def errors
@@ -284,8 +284,10 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   job = bigquery.query_job "SELECT COUNT(word) as count FROM " \
-        #                            "publicdata.samples.shakespeare"
+        #   query = "SELECT COUNT(word) as count FROM " \
+        #           "`bigquery-public-data.samples.shakespeare`"
+        #
+        #   job = bigquery.query_job query
         #
         #   job.cancel
         #
@@ -304,8 +306,10 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   job = bigquery.query_job "SELECT COUNT(word) as count FROM " \
-        #                            "publicdata.samples.shakespeare"
+        #   query = "SELECT COUNT(word) as count FROM " \
+        #           "`bigquery-public-data.samples.shakespeare`"
+        #
+        #   job = bigquery.query_job query
         #
         #   job.wait_until_done!
         #   job.rerun!
@@ -324,8 +328,10 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   job = bigquery.query_job "SELECT COUNT(word) as count FROM " \
-        #                            "publicdata.samples.shakespeare"
+        #   query = "SELECT COUNT(word) as count FROM " \
+        #           "`bigquery-public-data.samples.shakespeare`"
+        #
+        #   job = bigquery.query_job query
         #
         #   job.done?
         #   job.reload!
@@ -336,7 +342,7 @@ module Google
           gapi = service.get_job job_id
           @gapi = gapi
         end
-        alias_method :refresh!, :reload!
+        alias refresh! reload!
 
         ##
         # Refreshes the job until the job is `DONE`. The delay between refreshes
@@ -357,7 +363,7 @@ module Google
         #
         def wait_until_done!
           backoff = lambda do |retries|
-            delay = [retries ** 2 + 5, 60].min # Maximum delay is 60
+            delay = [retries**2 + 5, 60].min # Maximum delay is 60
             sleep delay
           end
           retries = 0
@@ -392,27 +398,29 @@ module Google
                                   body: error_body
         end
 
-        protected
-
-        ##
-        # Raise an error unless an active connection is available.
-        def ensure_service!
-          fail "Must have active connection" unless service
-        end
-
         ##
+        # @private
         # Get the subclass for a job type
         def self.klass_for gapi
           if gapi.configuration.copy
-            return CopyJob
+            CopyJob
           elsif gapi.configuration.extract
-            return ExtractJob
+            ExtractJob
           elsif gapi.configuration.load
-            return LoadJob
+            LoadJob
           elsif gapi.configuration.query
-            return QueryJob
+            QueryJob
+          else
+            Job
           end
-          Job
+        end
+
+        protected
+
+        ##
+        # Raise an error unless an active connection is available.
+        def ensure_service!
+          raise "Must have active connection" unless service
         end
 
         def retrieve_table project_id, dataset_id, table_id
@@ -427,8 +435,8 @@ module Google
           codes = { "accessDenied" => 403, "backendError" => 500,
                     "billingNotEnabled" => 403,
                     "billingTierLimitExceeded" => 400, "blocked" => 403,
-                    "duplicate" => 409, "internalError" =>500, "invalid" => 400,
-                    "invalidQuery" => 400, "notFound" =>404,
+                    "duplicate" => 409, "internalError" => 500,
+                    "invalid" => 400, "invalidQuery" => 400, "notFound" => 404,
                     "notImplemented" => 501, "quotaExceeded" => 403,
                     "rateLimitExceeded" => 403, "resourceInUse" => 400,
                     "resourcesExceeded" => 400, "responseTooLarge" => 403,

data/lib/google/cloud/bigquery/job/list.rb

@@ -160,7 +160,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active connection" unless @service
+            raise "Must have active connection" unless @service
           end
         end
       end

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

@@ -276,7 +276,7 @@ module Google
         #
         def input_files
           Integer @gapi.statistics.load.input_files
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -287,7 +287,7 @@ module Google
         #
         def input_file_bytes
           Integer @gapi.statistics.load.input_file_bytes
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -299,7 +299,7 @@ module Google
         #
         def output_rows
           Integer @gapi.statistics.load.output_rows
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -311,7 +311,7 @@ module Google
         #
         def output_bytes
           Integer @gapi.statistics.load.output_bytes
-        rescue
+        rescue StandardError
           nil
         end
       end

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

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 
-require "google/cloud/env"
 require "google/cloud/errors"
 require "google/cloud/bigquery/service"
 require "google/cloud/bigquery/credentials"
@@ -83,16 +82,7 @@ module Google
         def project_id
           service.project
         end
-        alias_method :project, :project_id
-
-        ##
-        # @private Default project_id.
-        def self.default_project_id
-          ENV["BIGQUERY_PROJECT"] ||
-            ENV["GOOGLE_CLOUD_PROJECT"] ||
-            ENV["GCLOUD_PROJECT"] ||
-            Google::Cloud.env.project_id
-        end
+        alias project project_id
 
         ##
         # Queries data by creating a [query
@@ -516,8 +506,8 @@ module Google
           if job.failed?
             begin
               # raise to activate ruby exception cause handling
-              fail job.gapi_error
-            rescue => e
+              raise job.gapi_error
+            rescue StandardError => e
               # wrap Google::Apis::Error with Google::Cloud::Error
               raise Google::Cloud::Error.from_error(e)
             end
@@ -667,7 +657,9 @@ module Google
 
           new_ds = Google::Apis::BigqueryV2::Dataset.new(
             dataset_reference: Google::Apis::BigqueryV2::DatasetReference.new(
-              project_id: project, dataset_id: dataset_id))
+              project_id: project, dataset_id: dataset_id
+            )
+          )
 
           # Can set location only on creation, no Dataset#location method
           new_ds.update! location: location unless location.nil?
@@ -973,7 +965,7 @@ module Google
         ##
         # Raise an error unless an active service is available.
         def ensure_service!
-          fail "Must have active connection" unless service
+          raise "Must have active connection" unless service
         end
       end
     end

data/lib/google/cloud/bigquery/project/list.rb

@@ -157,7 +157,7 @@ module Google
           ##
           # Raise an error unless an active service is available.
           def ensure_service!
-            fail "Must have active connection" unless @service
+            raise "Must have active connection" unless @service
           end
         end
       end

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

@@ -36,7 +36,7 @@ module Google
       #   bigquery = Google::Cloud::Bigquery.new
       #
       #   job = bigquery.query_job "SELECT COUNT(word) as count FROM " \
-      #                            "publicdata.samples.shakespeare"
+      #                            "`bigquery-public-data.samples.shakespeare`"
       #
       #   job.wait_until_done!
       #
@@ -113,7 +113,7 @@ module Google
 
         ##
         # Limits the billing tier for this job. Queries that have resource usage
-        # beyond this tier will fail (without incurring a charge). If
+        # beyond this tier will raise (without incurring a charge). If
         # unspecified, this will be set to your project default. For more
         # information, see [High-Compute
         # queries](https://cloud.google.com/bigquery/pricing#high-compute).
@@ -127,7 +127,7 @@ module Google
 
         ##
         # Limits the bytes billed for this job. Queries that will have bytes
-        # billed beyond this limit will fail (without incurring a charge). If
+        # billed beyond this limit will raise (without incurring a charge). If
         # `nil`, this will be set to your project default.
         #
         # @return [Integer, nil] The number of bytes, or `nil` for the project
@@ -135,7 +135,7 @@ module Google
         #
         def maximum_bytes_billed
           Integer @gapi.configuration.query.maximum_bytes_billed
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -156,7 +156,7 @@ module Google
         #
         def bytes_processed
           Integer @gapi.statistics.query.total_bytes_processed
-        rescue
+        rescue StandardError
           nil
         end
 
@@ -171,7 +171,7 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   sql = "SELECT word FROM publicdata.samples.shakespeare"
+        #   sql = "SELECT word FROM `bigquery-public-data.samples.shakespeare`"
         #   job = bigquery.query_job sql
         #
         #   job.wait_until_done!
@@ -253,7 +253,7 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   sql = "SELECT word FROM publicdata.samples.shakespeare"
+        #   sql = "SELECT word FROM `bigquery-public-data.samples.shakespeare`"
         #   job = bigquery.query_job sql
         #
         #   job.wait_until_done!
@@ -289,7 +289,7 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   sql = "SELECT word FROM publicdata.samples.shakespeare"
+        #   sql = "SELECT word FROM `bigquery-public-data.samples.shakespeare`"
         #   job = bigquery.query_job sql
         #
         #   job.wait_until_done!
@@ -311,7 +311,7 @@ module Google
             options
           Data.from_gapi_json data_hash, destination_table_gapi, service
         end
-        alias_method :query_results, :data
+        alias query_results data
 
         ##
         # Represents a stage in the execution plan for the query.
@@ -347,7 +347,7 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   sql = "SELECT word FROM publicdata.samples.shakespeare"
+        #   sql = "SELECT word FROM `bigquery-public-data.samples.shakespeare`"
         #   job = bigquery.query_job sql
         #
         #   job.wait_until_done!
@@ -416,7 +416,7 @@ module Google
         #
         #   bigquery = Google::Cloud::Bigquery.new
         #
-        #   sql = "SELECT word FROM publicdata.samples.shakespeare"
+        #   sql = "SELECT word FROM `bigquery-public-data.samples.shakespeare`"
         #   job = bigquery.query_job sql
         #
         #   job.wait_until_done!
@@ -453,7 +453,7 @@ module Google
           return unless destination_schema.nil?
 
           query_results_gapi = service.job_query_results job_id, max: 0
-          # fail "unable to retrieve schema" if query_results_gapi.schema.nil?
+          # raise "unable to retrieve schema" if query_results_gapi.schema.nil?
           @destination_schema_gapi = query_results_gapi.schema
         end