sql_query 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fc8c71815dfde7bb2eb7503a4ad55f1d6548d26
-  data.tar.gz: a2d86bca200575c2d2aab1bdda0d9931cf88d3f3
+  metadata.gz: 6233affd9d5b14c8b5fde8c0069abcf18b169986
+  data.tar.gz: a96b1300af78232fbbc6711b94c77564a4d96d4e
 SHA512:
-  metadata.gz: ca878c3e51f086d361c19d166d38b600627ee2291434d59278996878b10d1b0298dcfe4fc9de4432353acff1dadd710d120f2b6e0cbb8b9f9ba50573487ff62e
-  data.tar.gz: a2aebedede6e9bf180002202e07b0e9b431486ca916876e0c8d9427c3c8aa5801277e953085fd3987c5a40ea14a775a7089c7824b6d90353a3c171b0aa982865
+  metadata.gz: 21680690ae14a4f1ac2bc53037b66f032cd61a5cfc7ba330ee4c3a4dc8b6321184f885e92bc87ed2c97388a6a5f45b0d70da2a8f94f54dcea7307832ff023eb3
+  data.tar.gz: 7d8016fb14479175d9b7393b9ec345c94c87aaa1fa78a8deca7e8799942cd0eba7102ac1f66932e0eab0d678195b0bd43b0d4ec8295cee1e37a3ebf6130af5bc

data/.travis.yml

@@ -14,7 +14,7 @@ gemfile:
   - gemfiles/5.0.gemfile
 
 rvm:
-  - '2.3.3'
+  - '2.6.0'
 
 addons:
   postgresql: '9.4'

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # SqlQuery change log
 
-## 0.7.3 / Unreleased
+## 0.7.5 / Unreleased
 
 * [Added]
 
@@ -10,9 +10,15 @@
 
 * [Fixed]
 
+## 0.7.4 / 2024-04-20
+
+* [Added] Remove upper restriction for rails
+
+## 0.7.3 no changes
+
 ## 0.7.2 / 2022-01-23
 
-* [Added] rails 6.1 as supported version https://github.com/sufleR/sql_query/pull/10
+* [Added] rails 7.0 as supported version https://github.com/sufleR/sql_query/pull/12
 
 ## 0.7.1 / 2021-12-14
 

data/lib/sql_query.rb

@@ -34,7 +34,7 @@ class SqlQuery
   end
 
   def sql
-    @sql ||= ERB.new(File.read(file_path)).result(binding)
+    @sql ||= prepare_query(false)
   end
 
   def pretty_sql
@@ -46,7 +46,7 @@ class SqlQuery
   end
 
   def prepared_for_logs
-    sql.gsub(/(\n|\s)+/, ' ')
+    @sql_for_logs ||= prepare_query(true)
   end
 
   def partial(partial_name, partial_options = {})
@@ -75,6 +75,12 @@ class SqlQuery
 
   private
 
+  def prepare_query(for_logs)
+    query_template = File.read(file_path)
+    query_template = query_template.gsub(/(\n|\s)+/, ' ') if for_logs
+    ERB.new(query_template).result(binding)
+  end
+
   def split_to_path_and_name(file)
     if file.is_a?(Symbol)
       ['', file.to_s]

data/spec/sql_query_spec.rb

@@ -201,6 +201,16 @@ describe SqlQuery do
       expect(query.prepared_for_logs)
         .to eq("SELECT * FROM players WHERE email = 'e@mail.dev' ")
     end
+
+    context 'when embedded params have multiple whitespaces' do
+      let(:options) { { email: '   e@mail.dev   ' } }
+      let(:query) { described_class.new(file_name, options) }
+
+      it 'returns string without multiple whitespaces except embedded params' do
+        expect(query.prepared_for_logs)
+          .to eq("SELECT * FROM players WHERE email = '   e@mail.dev   ' ")
+      end
+    end
   end
 
   describe '.config' do

data/sql_query.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'sql_query'
-  spec.version       = '0.7.2'
+  spec.version       = '0.7.4'
   spec.authors       = ['sufleR']
   spec.email         = ['szymon.fracczak@gmail.com']
   spec.summary       = 'Ruby gem to load and execute SQL queries from `.sql.erb` templates'
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_dependency 'activerecord', '>= 3.2', '<= 7.0'
+  spec.add_dependency 'activerecord', '>= 3.2'
   spec.add_development_dependency 'appraisal'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pg', '~> 0.18'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sql_query
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - sufleR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-23 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement