dwh 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec16e1365da69bdc1778ff349775274d8b3a6d85978a9a69be0d6aa0da44d866
-  data.tar.gz: 4fc4ed0d62f7e657f80779265fec1945317cbdbd127e43c654916f2f0c157f88
+  metadata.gz: 6bfaf112cbfb915c0adc5d504514b6a634b666a97305e55ecbe89b71367fc784
+  data.tar.gz: 4e997a453cbff2e904b174b6872944c1a22612e69774a79fde835ea680f5f307
 SHA512:
-  metadata.gz: '008e23f7a38eae74baffc20f04b14daf6344dc5e3b9ae8616926fa74fe4bab393b4a21134755dcfc289e999ec967c2c5a2baa98044834ce1f415d6d179046ab4'
-  data.tar.gz: 2febcb2fb010b298d70b2e010dc1d2be942f63bacc4ef7e57eaf63e5fb616c27472037687ad144c706478ce80be66a7445f9479d9e774f78683ca9d6a9dc3732
+  metadata.gz: 649345383a23acece4522e778866b3c9f8ab7c4d5de76101bbca63a701ef71367336e58e7636831e350e58afbee6b59cbd95009a46ddabbb287d46b86129ebf8
+  data.tar.gz: 8be2519f016034f9796eeeec261ee9ba0ae56b2cbfe040260c02e817a5fe6ff74baba9b8de05d5aecf6543594ac4471dae9ee5202a169f2d95accec1f57186c6

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.6.2] - 2026-09-30
+
+### Added
+
+- **BigQuery**: `client_email` and `private_key` config accept the service-account keyfile's fields inline, so a server can connect without the JSON file on disk. `keyfile` and Application Default Credentials keep working.
+
+## [0.6.1] - 2026-09-30
+
+### Fixed
+
+- **BigQuery**: `quote` replaces characters BigQuery rejects in column names (parentheses and similar) so planner-generated aliases such as `Month(Post Date)` execute.
+
 ## [0.6.0] - 2026-09-28
 
 ### Added

data/README.md

@@ -153,4 +153,4 @@ This project is available as open source under the terms of the MIT License.
 
 ## Version
 
-Current version: 0.6.0
+Current version: 0.6.2

data/docs/guides/adapters.md

@@ -705,12 +705,14 @@ Requires the `google-cloud-bigquery` gem (`gem install google-cloud-bigquery`, p
 bq = DWH.create(:bigquery, {
     project_id: 'my-gcp-project',
     dataset: 'analytics',                        # default dataset for unqualified table names
-    keyfile: '/path/to/service-account.json',   # optional; omit to use Application Default Credentials
+    keyfile: '/path/to/service-account.json',   # optional; or pass the keyfile's fields inline:
+    # client_email: 'svc@my-gcp-project.iam.gserviceaccount.com',
+    # private_key: "-----BEGIN PRIVATE KEY-----\n...",
     query_timeout: 300                           # optional, seconds
 })
 ```
 
-Without `keyfile`, credentials resolve via `GOOGLE_APPLICATION_CREDENTIALS` or `gcloud auth application-default login`.
+`client_email` + `private_key` (the two fields the keyfile holds) let a server connect without the file on disk and take precedence over `keyfile`. Without either, credentials resolve via `GOOGLE_APPLICATION_CREDENTIALS` or `gcloud auth application-default login`.
 Extra client options can be passed with `extra_connection_params` (see `Google::Cloud::Bigquery.new`).
 
 ## Configuration Validation

data/lib/dwh/adapters/big_query.rb

@@ -13,6 +13,14 @@ module DWH
     #     keyfile: '/path/to/service-account.json'
     #   })
     #
+    # @example Inline service-account credentials (the keyfile's client_email and private_key)
+    #   DWH.create(:bigquery, {
+    #     project_id: 'my-gcp-project',
+    #     dataset: 'analytics',
+    #     client_email: 'svc@my-gcp-project.iam.gserviceaccount.com',
+    #     private_key: "-----BEGIN PRIVATE KEY-----\n..."
+    #   })
+    #
     # @example Application Default Credentials (gcloud auth application-default login)
     #   DWH.create(:bigquery, { project_id: 'my-gcp-project', dataset: 'analytics' })
     class BigQuery < Adapter
@@ -20,19 +28,35 @@ module DWH
       config :dataset, String, required: true, message: 'default dataset for unqualified table names'
       config :keyfile, String, required: false, default: nil,
                                message: 'path to service-account JSON; omit to use Application Default Credentials'
+      config :client_email, String, required: false, default: nil,
+                                    message: 'service-account email from the keyfile; use with private_key instead of keyfile'
+      config :private_key, String, required: false, default: nil,
+                                   message: 'service-account private key (PEM) from the keyfile; use with client_email'
       config :query_timeout, Integer, required: false, default: 300, message: 'query timeout in seconds'
 
       # The schema API reports legacy type names; map the ones whose
       # normalized type would otherwise be wrong (INTEGER is 64-bit in BigQuery).
       TYPE_ALIASES = { 'INTEGER' => 'INT64', 'FLOAT' => 'FLOAT64', 'BOOLEAN' => 'BOOL', 'RECORD' => 'STRUCT' }.freeze
 
+      # BigQuery column names, and therefore SELECT aliases, may not contain these
+      # characters (https://cloud.google.com/bigquery/docs/schemas#column_names).
+      # Dots are left alone so backtick-quoted `dataset.table` paths still work.
+      INVALID_NAME_CHARS = %r{[!"$()*,/;?@\[\\\]^{}~]}
+
+      # (see Functions#quote) Replaces characters BigQuery rejects in a column
+      # name so planner-generated aliases like "Month(Post Date)" execute.
+      def quote(exp)
+        super(exp.to_s.gsub(INVALID_NAME_CHARS, '_'))
+      end
+
       # (see Adapter#connection)
       def connection
         return @connection if @connection
 
         require 'google/cloud/bigquery'
         opts = { project_id: config[:project_id] }
-        opts[:credentials] = config[:keyfile] unless config[:keyfile].to_s.empty?
+        creds = google_credentials
+        opts[:credentials] = creds if creds
         @connection = Google::Cloud::Bigquery.new(**opts, **extra_connection_params)
       rescue LoadError
         raise ConfigError, <<~MSG
@@ -131,6 +155,17 @@ module DWH
 
       private
 
+      # Inline service-account fields win over a keyfile path. Neither present
+      # means Application Default Credentials.
+      def google_credentials
+        if config[:client_email].to_s != '' && config[:private_key].to_s != ''
+          { 'type' => 'service_account', 'project_id' => config[:project_id],
+            'client_email' => config[:client_email], 'private_key' => config[:private_key] }
+        elsif config[:keyfile].to_s != ''
+          config[:keyfile]
+        end
+      end
+
       def dataset_name(qualifiers)
         qualifiers[:dataset] || qualifiers[:schema] || config[:dataset]
       end

data/lib/dwh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DWH
-  VERSION = '0.6.0'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwh
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Ajo Abraham