lhm-shopify 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e88f970c0a74075057e83cd9dddaff855c4b1260279604badc45af7d4f096f0
-  data.tar.gz: 722aefe84a0e97d6702b4b2706df2ad9c9084dec24be0e3e790fa4f4f535ea73
+  metadata.gz: f0c79dc83baf664e8cd4ad2e11f8e72b3927edbb2af0beb5626961339e7f75c7
+  data.tar.gz: 1a58b01ab3ab768c37f497e24329d0e4e3d85dc64af7b1a338c5447b742f4a4b
 SHA512:
-  metadata.gz: f423dbc69088a1e314e0b460a051f5a3438754382a5f26008e2ed1e754da771467a532c9f269cbfd2e1e0aa347e600b3dbabc436f8cc94c32d0d99819cb0f832
-  data.tar.gz: 047c7221c4eb28d5bc01a16287b5e813e46dbc6b7effae12ff6778660e8e295adb53490d9825c8ca714df6e00b3abef50cff522a2f29a0ae9c6834797e9c93e5
+  metadata.gz: e349310577754cebfe7fa4d067727946c19fb0b291f1f2305e87d26a7d30371fd37c80bcdb58039936c90c75618157904f3141722e5f3f83c9b0e05afb76e447
+  data.tar.gz: 63fe5f4a016b32ab3d299e5cd9368f226a575bd725040931b8dd28db7e8a35cef7fbd78f0ec2713108dd508a974c7b783734a02e4d724a3b40e00afb7502693e

data/.github/workflows/test.yml

@@ -13,9 +13,10 @@ jobs:
 
     strategy:
       fail-fast: false
+      max-parallel: 8
       matrix:
-        activerecord: ["6.1", "7.0", "7.1"]
-        ruby: ["3.0", "3.1", "3.2", "3.3", "head"]
+        activerecord: ["6.1", "7.0", "7.1", "head"]
+        ruby: ["3.1", "3.2", "3.3", "head"]
         mysql: ["5.7", "8.0"]
         adapter: ["mysql2", "trilogy"]
         exclude:
@@ -23,6 +24,8 @@ jobs:
             ruby: head
           - activerecord: 7.0
             ruby: head
+          - activerecord: head
+            ruby: 3.0
 
     env:
       BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord_${{ matrix.activerecord }}.gemfile"
@@ -40,7 +43,7 @@ jobs:
 
       - name: Setup MySQL and ProxySQL (docker-compose)
         # Might have to change to docker compose up -d (i.e. Compose V2) when the Ubuntu image changes the docker-compose version
-        run: docker-compose -f docker-compose-mysql-${{ matrix.mysql }}.yml up -d
+        run: docker compose -f docker-compose-mysql-${{ matrix.mysql }}.yml up -d
 
       - name: Wait until DBs are alive
         run: ./scripts/helpers/wait-for-dbs.sh

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# 4.3.0 (Aug, 2024)
+* Drop support for Ruby 3.0, as it reached its EOL
+* Add support for next Rails version
+
 # 4.2.3 (Jul, 2024)
 * Fix check for warnings against PKs with line breaks
 

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    lhm-shopify (4.2.3)
+    lhm-shopify (4.3.0)
       retriable (>= 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
-    activesupport (7.1.1)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -28,22 +28,21 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     byebug (11.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    docile (1.4.0)
-    drb (2.1.1)
-      ruby2_keywords
-    i18n (1.14.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.22.2)
-    mocha (2.1.0)
+    minitest (5.24.1)
+    mocha (2.4.5)
       ruby2_keywords (>= 0.0.5)
-    mutex_m (0.1.2)
-    mysql2 (0.5.5)
-    rake (13.0.6)
+    mutex_m (0.2.0)
+    mysql2 (0.5.6)
+    rake (13.2.1)
     retriable (3.1.2)
     ruby2_keywords (0.0.5)
     simplecov (0.22.0)
@@ -52,10 +51,10 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    thor (1.2.2)
-    timeout (0.4.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     toxiproxy (2.0.2)
-    trilogy (2.6.0)
+    trilogy (2.8.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 

data/dev.yml

@@ -1,9 +1,7 @@
 name: lhm
 up:
-  - homebrew:
-      - mysql-client@5.7:
-          or: [mysql@5.7]
-          conflicts: [shopify/shopify/mysql-client, mysql-connector-c, mysql, mysql-client]
+  - packages:
+      - mysql-client@5.7
       - wget
   - ruby
   - bundler

data/gemfiles/activerecord_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.2.3)
+    lhm-shopify (4.3.0)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.2.3)
+    lhm-shopify (4.3.0)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    lhm-shopify (4.2.3)
+    lhm-shopify (4.3.0)
       retriable (>= 3.0.0)
 
 GEM

data/gemfiles/activerecord_head.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", git: "https://github.com/rails/rails.git", branch: "main"
+
+gemspec path: "../"

data/lib/lhm/sql_helper.rb

@@ -65,7 +65,7 @@ module Lhm
     end
 
     def struct_key(struct, key)
-      keys = if struct.is_a? Hash
+      keys = if struct.respond_to?(:keys)
                struct.keys
              else
                struct.members

data/lib/lhm/version.rb

@@ -2,5 +2,5 @@
 # Schmidt
 
 module Lhm
-  VERSION = '4.2.3'
+  VERSION = '4.3.0'
 end

data/spec/integration/lhm_spec.rb

@@ -328,8 +328,7 @@ describe Lhm do
           :collate => collation,
         })
 
-        result = select_one('SELECT login from users')
-        result = result['login'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT login from users')
         value(result).must_equal('a user')
       end
     end
@@ -353,8 +352,7 @@ describe Lhm do
           :collate => collation,
         })
 
-        result = select_one('SELECT `fnord` from users')
-        result = result['fnord'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `fnord` from users')
         value(result).must_equal('Superfriends')
       end
     end
@@ -380,8 +378,7 @@ describe Lhm do
              :collate => 'utf8mb4_unicode_ci',
            })
 
-        result = select_one('SELECT `user_name` from users')
-        result = result['user_name'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `user_name` from users')
         value(result).must_equal('a user')
       end
     end
@@ -410,8 +407,7 @@ describe Lhm do
            :collate => nil,
          })
 
-        result = select_one('SELECT `ref` from users')
-        result = result['ref'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `ref` from users')
         value(result).must_equal(10)
       end
     end
@@ -437,8 +433,7 @@ describe Lhm do
            :collate => collation,
          })
 
-        result = select_one('SELECT `fnord` from users')
-        result = result['fnord'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `fnord` from users')
         assert_nil(result)
       end
     end
@@ -462,8 +457,7 @@ describe Lhm do
           :collate => collation,
         })
 
-        result = select_one('SELECT `user_name` from users')
-        result = result['user_name'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `user_name` from users')
         value(result).must_equal('a user')
       end
     end
@@ -489,8 +483,7 @@ describe Lhm do
           :collate => collation,
         })
 
-        result = select_one('SELECT `user_name` from users')
-        result = result['user_name'] if result.respond_to?(:has_key?)
+        result = select_value('SELECT `user_name` from users')
         value(result).must_equal('a user')
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhm-shopify
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - SoundCloud
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
@@ -212,6 +212,7 @@ files:
 - gemfiles/activerecord_7.0.gemfile.lock
 - gemfiles/activerecord_7.1.gemfile
 - gemfiles/activerecord_7.1.gemfile.lock
+- gemfiles/activerecord_head.gemfile
 - lhm.gemspec
 - lib/lhm-shopify.rb
 - lib/lhm.rb