spectre-mysql 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d437bc149a21da027b8388b21bb85462a2f4d04a4e3183c57447e6c2a5c756
-  data.tar.gz: 79588cac00639fc145c5f08064fc1444f00280ec94efd78f9687e179824ab7d1
+  metadata.gz: 1a957d159ca7f939e6710886b86c1cc613c91f820bb80a0125370490baa63cec
+  data.tar.gz: cf8797af1f3ce1029d6d557c03f92298ab06623e6fc7db808d1497f5f3264a47
 SHA512:
-  metadata.gz: dae040d6f4fb8f9db79cdf62eafd6074694b1730d248bb00289aa9719277bab0f96eda6150219374da8f68b125979a4fea90642253425c1d64c630a58e9ee18c
-  data.tar.gz: 7c7c148a57c20fc03ce2e6421a524058ccd99d74f6d8975d3c5b55ac36149d62d0d73858ce4306e3c09718b3ec7c633e41409f672c5fcd0786054d80582dbcf2
+  metadata.gz: 60b752ef0adb33e8dccd977da8fce8be334b775b7bc09fac5b4271880dddfc594f0bdcb99b36e268b08a6c0d05bc692b63b95e5cfaa3114c7b3d353761a4e0be
+  data.tar.gz: 5cb6a0dad716fccbd96355e3e97eb72b7d393d5b47d0531f61b04d024a01ecbf2ba041e767979928eaebba3ab62f2e20c272ce213f2f4fa1d1b2308081149a5e

data/lib/spectre/mysql.rb

@@ -7,29 +7,33 @@ module Spectre
     class MySqlQuery
       include Spectre::Delegate if defined? Spectre::Delegate
 
-      def initialize query
-        @__query = query
+      def initialize config
+        @__config = config
       end
 
       def host hostname
-        @__query['host'] = hostname
+        @__config['host'] = hostname
       end
 
       def username user
-        @__query['username'] = user
+        @__config['username'] = user
       end
 
       def password pass
-        @__query['password'] = pass
+        @__config['password'] = pass
       end
 
       def database name
-        @__query['database'] = name
+        @__config['database'] = name
+      end
+
+      def ssl mode
+        @__config['ssl'] = mode
       end
 
       def query statement
-        @__query['query'] = [] unless @__query.key? 'query'
-        @__query['query'].append(statement)
+        @__config['query'] = [] unless @__config.key? 'query'
+        @__config['query'].append(statement)
       end
     end
 
@@ -45,71 +49,55 @@ module Spectre
       end
 
       def mysql(name = nil, &)
-        query = {}
+        config = {}
 
         if !name.nil? and @config.key? name
-          query.merge! @config[name]
+          config.merge! @config[name]
 
-          unless query['host']
+          unless config['host']
             raise "No `host' set for MySQL client '#{name}'. Check your MySQL config in your environment."
           end
 
         elsif !name.nil?
-          query['host'] = name
-        elsif @last_conn.nil?
+          config['host'] = name
+        elsif @last_conn
+          config['host']     = @last_conn[:host]
+          config['username'] = @last_conn[:username]
+          config['password'] = @last_conn[:password]
+          config['database'] = @last_conn[:database]
+          config['ssl']      = @last_conn[:ssl_mode]
+        else
           raise 'No name given and there was no previous MySQL connection to use'
         end
 
-        MySqlQuery.new(query).instance_eval(&) if block_given?
+        MySqlQuery.new(config).instance_eval(&) if block_given?
 
-        unless name.nil?
-          @last_conn = {
-            host: query['host'],
-            username: query['username'],
-            password: query['password'],
-            database: query['database'],
-          }
-        end
+        @last_conn = {
+          host: config['host'],
+          username: config['username'],
+          password: config['password'],
+          database: config['database'],
+          ssl_mode: (config['ssl'] || :required).to_sym,
+        }
 
-        @logger.info "Connecting to database #{query['username']}@#{query['host']}:#{query['database']}"
+        @logger.info "Connecting to database #{@last_conn[:username]}@#{@last_conn[:host]}:#{@last_conn[:database]}"
 
         client = ::Mysql2::Client.new(**@last_conn)
 
-        res = []
-
-        query['query']&.each do |statement|
-          @logger.info("Executing statement '#{statement}'")
+        begin
+          res = nil
 
-          # FIXED: Disable automatic casting to prevent BigDecimal errors
-          # This prevents mysql2 from trying to cast VARCHAR columns to BigDecimal
-          res = client.query(statement, cast: false, cast_booleans: false)
-        end
-
-        # FIXED: Safely convert rows to OpenStruct with error handling
-        # If casting is still problematic, we catch the error and retry with manual conversion
-        if res
-          begin
-            @result = res.map { |row| OpenStruct.new row }
-          rescue ArgumentError => e
-            raise unless e.message.include?('BigDecimal')
-
-            @logger.warn "BigDecimal casting error detected, falling back to safe conversion: #{e.message}"
-            # Manually convert each row, skipping problematic values
-            @result = res.map do |row|
-              safe_row = {}
-              row.each do |key, value|
-                safe_row[key] = begin
-                  value.to_s
-                rescue StandardError
-                  value
-                end
-              end
-              OpenStruct.new(safe_row)
-            end
+          config['query']&.each do |statement|
+            @logger.info("Executing statement '#{statement}'")
+            # cast: false returns all columns as strings — Spectre tests treat values as opaque,
+            # and this avoids mysql2's BigDecimal/Date casting failures on driver-level mismatches.
+            res = client.query(statement, cast: false, cast_booleans: false)
           end
-        end
 
-        client.close
+          @result = res.map { |row| OpenStruct.new(row) } if res
+        ensure
+          client.close
+        end
       end
 
       def result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-mysql
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Christian Neubauer