sequel-snowflake 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eba6e3849823d647dca41ee39a327c8c2e832bfc4f45ceb33d184ae06ed834c4
-  data.tar.gz: b04b7c352deb704dc3b08dda547fd6b52e0cecdb6fe52cc1f2abce3f4c4b8c3a
+  metadata.gz: d6b1159aee571c7ffc1ebf32e71fbdc7e572cbd98eafae9c88443b2363dd5754
+  data.tar.gz: 8f17176c4dc7405215dac368192083f9ccb6ea8fe15c42128ff696521e8f928e
 SHA512:
-  metadata.gz: f682678759afd025e0ca7a7fc87c1dcdf5aaeb4c39b31519453d4064e2a168e43488a8dad341020b189a5dd65b191e22a9df51654f7b3d0b5a869a8b08abf94f
-  data.tar.gz: 2b83a1c9bbea68cb0ae13497f1bb8b15d7ad767ab8b0a83f26c12b3ec753b70081a1d7c56bc89b78e9da8cbc5812bbb51df5ee09321071ff6698aa2f4b9adeb0
+  metadata.gz: 5721cfb399697e66a49c15f1e508a7ef2387822f6101150285e0c0cb8642321a0f74caaaaf9ceb22f7bcc7ecac24d214d9201997524bdbcfd72532defffe6d68
+  data.tar.gz: d16d45d262ceedf60d3b95909322c9020bcacebfbc4de0f4a8fbe6bae33233179844f6738c7ac493218379cc8305d68319e608f280bbe93543e90d98974df51f

data/.github/workflows/gem-push.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby 3.1
+    - name: Set up Ruby 3.4
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.4
 
     - name: Publish to RubyGems
       run: |

data/.github/workflows/ruby.yml

@@ -19,16 +19,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['3.3', '3.4']
 
     steps:
     - uses: actions/checkout@v2
-    - name: Install unix-odbc
-      run: sudo apt-get install unixodbc
+    - name: Update package lists
+      run: sudo apt-get update
+    - name: Install unixodbc-dev, odbcinst, and unixodbc
+      run: sudo apt-get -y install unixodbc-dev odbcinst unixodbc
     - name: Install Snowflake ODBC driver
       run: curl ${SNOWFLAKE_DRIVER_URL} -o snowflake_driver.deb && sudo dpkg -i snowflake_driver.deb
       env:
-        SNOWFLAKE_DRIVER_URL: https://sfc-repo.snowflakecomputing.com/odbc/linux/2.25.2/snowflake-odbc-2.25.2.x86_64.deb
+        SNOWFLAKE_DRIVER_URL: https://sfc-repo.snowflakecomputing.com/odbc/linux/3.12.0/snowflake-odbc-3.12.0.x86_64.deb
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.3.0 / 2025-11-17
+* Add support for `GROUP CUBE`
+* Add support for `GROUP ROLLUP`
+* Add support for `GROUPING SETS`
+
+## 2.2.0 / 2023-10-17
+* Add support for `MERGE` (credit: @benalavi)
+* Add requirement for `sequel` v5.58.0 or newer (to support the new MERGE methods).
+
 ## 2.1.0 / 2022-06-17
 * Add support for `EXPLAIN`.
 

data/README.md

@@ -3,7 +3,7 @@
 An adapter to connect to Snowflake databases using [Sequel](http://sequel.jeremyevans.net/).
 This provides proper types for returned values, as opposed to the ODBC adapter.
 
-[![Ruby](https://github.com/Yesware/sequel-snowflake/actions/workflows/ruby.yml/badge.svg)](https://github.com/Yesware/sequel-snowflake/actions/workflows/ruby.yml)
+[![Ruby](https://github.com/vendasta/sequel-snowflake/actions/workflows/ruby.yml/badge.svg)](https://github.com/vendasta/sequel-snowflake/actions/workflows/ruby.yml)
 
 ## Installation
 
@@ -24,6 +24,11 @@ You'll also need [unixODBC](http://www.unixodbc.org/) (if on Linux/macOS) and th
 this adapter. Follow the Snowflake documentation on their ODBC Driver
 [here](https://docs.snowflake.com/en/user-guide/odbc.html) before proceeding.
 
+After installing, you may need to configure `simba.snowflake.ini` and set
+`DriverManagerEncoding` to "UTF-16", the default encoding for unixODBC. If
+unixODBC was built specifically with the `DSQL_WCHART_CONVERT` flag, then
+Snowflake's default of "UTF-32" is fine as-is.
+
 ## Usage
 
 When establishing the connection, specify `:snowflake` as the adapter to use.
@@ -57,7 +62,7 @@ be taken down either via the `after(:each)` blocks or when the connection is clo
 
 We have two workflows included in this project:
 
-* Ruby (`ruby.yml`): This runs the specs for this gem against Ruby 2.6, 2.7, and 3.0. Note
+* Ruby (`ruby.yml`): This runs the specs for this gem against Ruby 3.3 and 3.4. Note
 that this requires the secret `SNOWFLAKE_CONN_STR` to be set (see above for example connection string),
 as we need to connect to Snowflake to run tests. These specs will be run for every pull request,
 and is run after every commit to those branches.
@@ -68,7 +73,7 @@ to authenticate with RubyGems.
 
 ## Contributing
 
-1. Fork it ( https://github.com/Yesware/sequel-snowflake/fork )
+1. Fork it ( https://github.com/vendasta/sequel-snowflake/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/sequel/adapters/snowflake.rb

@@ -38,6 +38,26 @@ module Sequel
         self
       end
 
+      # https://docs.snowflake.com/en/sql-reference/constructs/group-by-cube
+      def supports_group_cube?
+        true
+      end
+
+      # https://docs.snowflake.com/en/sql-reference/constructs/group-by-rollup
+      def supports_group_rollup?
+        true
+      end
+
+      # https://docs.snowflake.com/en/sql-reference/constructs/group-by-grouping-sets
+      def supports_grouping_sets?
+        true
+      end
+
+      # https://docs.snowflake.com/en/sql-reference/sql/merge
+      def supports_merge?
+        true
+      end
+
       # This is similar to the ODBC adapter's Dataset#convert_odbc_value, except for some special casing
       # around Snowflake numerics, which come in through ODBC as Strings instead of Numbers.
       # In those cases, we need to examine the column type as well as the scale,

data/lib/sequel-snowflake/version.rb

@@ -1,6 +1,6 @@
 module Sequel
   module Snowflake
     # sequel-snowflake version
-    VERSION = "2.1.0"
+    VERSION = "2.3.0"
   end
 end

data/mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "latest"

data/sequel-snowflake.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.summary       = %q{Sequel adapter for Snowflake}
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/Yesware/sequel-snowflake"
+  spec.homepage      = "https://github.com/vendasta/sequel-snowflake"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_runtime_dependency 'sequel'
+  spec.add_runtime_dependency 'sequel', '>= 5.58.0'
   spec.add_runtime_dependency 'ruby-odbc'
 
   spec.add_development_dependency 'rake'

data/spec/sequel/adapters/snowflake_spec.rb

@@ -1,10 +1,19 @@
 require 'securerandom'
 
 describe Sequel::Snowflake::Dataset do
+  let(:db) { @db ||= Sequel.connect(adapter: :snowflake, drvconnect: ENV['SNOWFLAKE_CONN_STR']) }
+  
+  before(:all) do
+    @db = Sequel.connect(adapter: :snowflake, drvconnect: ENV['SNOWFLAKE_CONN_STR'])
+  end
+  
+  after(:all) do
+    @db.disconnect if @db
+  end
+
   describe 'Converting Snowflake data types' do
     # Create a test table with a reasonably-random suffix
-    let!(:test_table) { "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym }
-    let!(:db) { Sequel.connect(adapter: :snowflake, drvconnect: ENV['SNOWFLAKE_CONN_STR']) }
+    let(:test_table) { "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym }
 
     before(:each) do
       # Set timezone for parsing timestamps. This gives us a consistent timezone to test against below.
@@ -69,28 +78,189 @@ describe Sequel::Snowflake::Dataset do
     end
   end
 
-  describe '#explain' do
-    # Create a test table with a reasonably-random suffix
-    let!(:test_table) { "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym }
-    let!(:db) { Sequel.connect(adapter: :snowflake, drvconnect: ENV['SNOWFLAKE_CONN_STR']) }
+  describe 'GROUP BY features' do
+    before(:all) do
+      @products = "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym
+      @sales = "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym
+
+      @db.create_table(@products, :temp => true) do
+        Integer :product_id
+        Float :wholesale_price
+      end
+
+      @db.create_table(@sales, :temp => true) do
+        Integer :product_id
+        Float :retail_price
+        Integer :quantity
+        String :city
+        String :state
+      end
+
+      @db[@products].insert({ product_id: 1, wholesale_price: 1.00 })
+      @db[@products].insert({ product_id: 2, wholesale_price: 2.00 })
+      @db[@sales].insert({ product_id: 1, retail_price: 2.00, quantity: 1, city: 'SF', state: 'CA' })
+      @db[@sales].insert({ product_id: 1, retail_price: 2.00, quantity: 2, city: 'SJ', state: 'CA' })
+      @db[@sales].insert({ product_id: 2, retail_price: 5.00, quantity: 4, city: 'SF', state: 'CA' })
+      @db[@sales].insert({ product_id: 2, retail_price: 5.00, quantity: 8, city: 'SJ', state: 'CA' })
+      @db[@sales].insert({ product_id: 2, retail_price: 5.00, quantity: 16, city: 'Miami', state: 'FL' })
+      @db[@sales].insert({ product_id: 2, retail_price: 5.00, quantity: 32, city: 'Orlando', state: 'FL' })
+      @db[@sales].insert({ product_id: 2, retail_price: 5.00, quantity: 64, city: 'SJ', state: 'CA' })
+    end
+
+    after(:all) do
+      @db.drop_table(@products) if @products
+      @db.drop_table(@sales) if @sales
+    end
+
+    let(:products) { @products }
+    let(:sales) { @sales }
+
+    it 'can use GROUP CUBE' do
+      res = db.from(Sequel[products].as(:p)).
+        join(Sequel[sales].as(:s), Sequel[:p][:product_id] => Sequel[:s][:product_id]).
+        select(
+          Sequel[:s][:state],
+          Sequel[:s][:city],
+          Sequel.function(:sum, Sequel.*(Sequel.-(Sequel[:s][:retail_price], Sequel[:p][:wholesale_price]), Sequel[:s][:quantity])).as(:profit)
+        ).
+        group(Sequel[:s][:state], Sequel[:s][:city]).
+        group_cube.
+        order(Sequel.asc(Sequel[:s][:state], nulls: :last)).
+        order_append(Sequel[:s][:city]).
+        all
+
+      expect(res).to match_array([
+        { state: 'CA', city: 'SF', profit: 13 },
+        { state: 'CA', city: 'SJ', profit: 218 },
+        { state: 'CA', city: nil, profit: 231 },
+        { state: 'FL', city: 'Miami', profit: 48 },
+        { state: 'FL', city: 'Orlando', profit: 96 },
+        { state: 'FL', city: nil, profit: 144 },
+        { state: nil, city: 'Miami', profit: 48 },
+        { state: nil, city: 'Orlando', profit: 96 },
+        { state: nil, city: 'SF', profit: 13 },
+        { state: nil, city: 'SJ', profit: 218 },
+        { state: nil, city: nil, profit: 375 },
+      ])
+    end
+
+    it 'can use GROUP ROLLUP' do
+      res = db.from(Sequel[products].as(:p)).
+        join(Sequel[sales].as(:s), Sequel[:p][:product_id] => Sequel[:s][:product_id]).
+        select(
+          Sequel[:s][:state],
+          Sequel[:s][:city],
+          Sequel.function(:sum, Sequel.*(Sequel.-(Sequel[:s][:retail_price], Sequel[:p][:wholesale_price]), Sequel[:s][:quantity])).as(:profit)
+        ).
+        group(Sequel[:s][:state], Sequel[:s][:city]).
+        group_rollup.
+        order(Sequel.asc(Sequel[:s][:state], nulls: :last)).
+        order_append(Sequel[:s][:city]).
+        all
+
+      expect(res).to match_array([
+        { state: 'CA', city: 'SF', profit: 13 },
+        { state: 'CA', city: 'SJ', profit: 218 },
+        { state: 'CA', city: nil, profit: 231 },
+        { state: 'FL', city: 'Miami', profit: 48 },
+        { state: 'FL', city: 'Orlando', profit: 96 },
+        { state: 'FL', city: nil, profit: 144 },
+        { state: nil, city: nil, profit: 375 },
+      ])
+    end
+
+    it 'can use GROUPING SETS' do
+      res = db.from(Sequel[products].as(:p)).
+        join(Sequel[sales].as(:s), Sequel[:p][:product_id] => Sequel[:s][:product_id]).
+        select(
+          Sequel[:s][:state],
+          Sequel[:s][:city],
+          Sequel.function(:sum, Sequel.*(Sequel.-(Sequel[:s][:retail_price], Sequel[:p][:wholesale_price]), Sequel[:s][:quantity])).as(:profit)
+        ).
+        group([Sequel[:s][:state]], [Sequel[:s][:city]]).
+        grouping_sets.
+        order(Sequel.asc(Sequel[:s][:state], nulls: :last)).
+        order_append(Sequel[:s][:city]).
+        all
+
+      expect(res).to match_array([
+        { state: 'CA', city: nil, profit: 231 },
+        { state: 'FL', city: nil, profit: 144 },
+        { state: nil, city: 'Miami', profit: 48 },
+        { state: nil, city: 'Orlando', profit: 96 },
+        { state: nil, city: 'SF', profit: 13 },
+        { state: nil, city: 'SJ', profit: 218 },
+      ])
+    end
+  end
+
+  describe 'MERGE feature' do
+    before(:all) do
+      @target_table = "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym
+      @source_table = "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym
+
+      @db.create_table(@target_table, :temp => true) do
+        String :str
+        String :str2
+        String :str3
+      end
+
+      @db.create_table(@source_table, :temp => true) do
+        String :from
+        String :to
+        String :whomst
+      end
+    end
+
+    after(:all) do
+      @db.drop_table(@target_table) if @target_table
+      @db.drop_table(@source_table) if @source_table
+    end
 
     before(:each) do
-      db.create_table(test_table, :temp => true) do
+      # Clear and repopulate data for each test since MERGE modifies data
+      db[@target_table].delete
+      db[@source_table].delete
+      db[@target_table].insert({ str: 'foo', str2: 'foo', str3: 'phoo' })
+      db[@target_table].insert({ str: 'baz', str2: 'foo', str3: 'buzz' })
+      db[@source_table].insert({ from: 'foo', to: 'bar', whomst: 'me' })
+    end
+
+    let(:target_table) { @target_table }
+    let(:source_table) { @source_table }
+
+    it 'can use MERGE' do
+      db[target_table].merge_using(source_table, str: :from).merge_update(str2: :to).merge
+
+      expect(db[target_table].select_all.all).to match_array([
+        { str: 'foo', str2: 'bar', str3: 'phoo' },
+        { str: 'baz', str2: 'foo', str3: 'buzz' }
+      ])
+    end
+  end
+
+  describe '#explain' do
+    before(:all) do
+      @test_table = "SEQUEL_SNOWFLAKE_SPECS_#{SecureRandom.hex(10)}".to_sym
+
+      @db.create_table(@test_table, :temp => true) do
         Numeric :id
         String :name
         String :email
         String :title
       end
 
-      db[test_table].insert(
+      @db[@test_table].insert(
         { id: 1, name: 'John Null', email: 'j.null@example.com', title: 'Software Tester' }
       )
     end
 
-    after(:each) do
-      db.drop_table(test_table)
+    after(:all) do
+      @db.drop_table(@test_table) if @test_table
     end
 
+    let(:test_table) { @test_table }
+
     it "should have explain output" do
       query = db.fetch("SELECT * FROM #{test_table} WHERE ID=1;")
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: sequel-snowflake
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Yesware, Inc
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.58.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.58.0
 - !ruby/object:Gem::Dependency
   name: ruby-odbc
   requirement: !ruby/object:Gem::Requirement
@@ -100,15 +99,15 @@ files:
 - lib/sequel-snowflake/version.rb
 - lib/sequel/adapters/shared/snowflake.rb
 - lib/sequel/adapters/snowflake.rb
+- mise.toml
 - sequel-snowflake.gemspec
 - spec/sequel/adapters/snowflake_spec.rb
 - spec/snowflake_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/Yesware/sequel-snowflake
+homepage: https://github.com/vendasta/sequel-snowflake
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -123,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Sequel adapter for Snowflake
 test_files: