mysql_framework 2.1.7 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7cfae16762fc02981eed438b941a6eddbf69df7f24d7d7a6c390604064518da
-  data.tar.gz: aba1911d97941727399a9bd815df8453b276761c736ced329298f8c18b65f69e
+  metadata.gz: 91ca6641d16e5f4d344b6749fe9f5291c8f24b23f4f8efb28ac8e76443d61750
+  data.tar.gz: 961c49140b91c9ea461a1512d63bb89a5861ed5375386e21e21be1c0e1691f2b
 SHA512:
-  metadata.gz: ee9ad256b44ed8ec1db8b9039a72324d3045d5e5b2063c88d64605f63c3bf089d4da383cb1ebece12027dea5a20a7d98734e90192874ce2340244286cea2a0fc
-  data.tar.gz: 5d867a1db81ccb22887246584ee8020a934e88f11bc5f434ff07e5a1100c89601d13e151406b9c924073a46c72ca3d26b82a4965a1bb02c846cd3239bfc66ebc
+  metadata.gz: 3b3b3b5ebf141f85110733c54cf6c190e8c091bb681d0e9fc555643efaca73cc29f61964f7ce06142ed48fa466bb49c1f616ff48ba3d44223db12d414e6bcc81
+  data.tar.gz: a0119d3cb52bc3d513054fe803f9627dfd6ca0c20f51dc602fcfe36897227bb6ea29933cff88599f1fbb5d7019bad8cf971aedf887b216fbd5a07c55e39f8b33

data/lib/mysql_framework/scripts/manager.rb

@@ -8,7 +8,7 @@ module MysqlFramework
       end
 
       def execute
-        lock_manager.with_lock(key: self.class) do
+        lock_manager.with_lock(key: self.class.name) do
           initialize_script_history
 
           executed_scripts = retrieve_executed_scripts

data/lib/mysql_framework/sql_query.rb

@@ -127,7 +127,7 @@ module MysqlFramework
       @sql += " (#{conditions.join(' AND ')}) "
 
       conditions.each do |condition|
-        next if condition.value.nil?
+        next if condition.value.nil? && !skip_nil_validation?
         if condition.value.is_a?(Enumerable)
           @params.concat(condition.value)
         else
@@ -263,5 +263,11 @@ module MysqlFramework
 
       self
     end
+
+    private
+
+    def skip_nil_validation?
+      ENV.fetch('MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION', 'false').downcase == 'true'
+    end
   end
 end

data/lib/mysql_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MysqlFramework
-  VERSION = '2.1.7'
+  VERSION = '2.1.9'
 end

data/spec/lib/mysql_framework/sql_query_spec.rb

@@ -233,6 +233,33 @@ describe MysqlFramework::SqlQuery do
         expect(subject.sql).to eq('WHERE (`gems`.`author` = ? AND `gems`.`created_at` > ?) AND (`gems`.`name` IN (?, ?))')
       end
     end
+
+    context 'when condition is nil' do
+      context 'when MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION is not present' do
+        it 'concats the parameter collections' do
+          expect { subject.where(gems[:created_at].eq(nil)) }.to raise_error ArgumentError
+        end
+      end
+
+      context 'when MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION is present' do
+        after(:each) { ENV.delete('MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION') }
+
+        context 'when value is false' do
+          it 'concats the parameter collections' do
+            ENV['MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION'] =  'false'
+            expect { subject.where(gems[:created_at].eq(nil)) }.to raise_error ArgumentError
+          end
+        end
+
+        context 'when value is true' do
+          it 'concats the parameter collections' do
+            ENV['MYSQL_FRAMEWORK_SKIP_NIL_VALUE_VALIDATION'] =  'true'
+            query = subject.where(gems[:updated_at].eq(nil))
+            expect(query.params).to eq ['sage', '2018-01-01 00:00:00', nil]
+          end
+        end
+      end
+    end
   end
 
   describe '#and' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_framework
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.9
 platform: ruby
 authors:
 - Sage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake