sql_query 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8726a8dd720904305975d654dca7d89e6f15c5c
-  data.tar.gz: 7a9756044cde8b2658ba19e1246f62cbae1bdf2c
+  metadata.gz: 6233affd9d5b14c8b5fde8c0069abcf18b169986
+  data.tar.gz: a96b1300af78232fbbc6711b94c77564a4d96d4e
 SHA512:
-  metadata.gz: 19a3717cfaf7c5465a7c8c5ed289cfbcfe55bba972951a58a82665b38382a75009a1af08486de8b1a748e9240afa1679e31814f25d21116c8ee422872e0a4551
-  data.tar.gz: 3b9e8c25f91d635e3225c47c5f36f1718879519791ce017ea620cfec1bd204e633104dda4fb6a361a00b191d841c44e4227e347dfa73ed3cada1ce30d760ce7a
+  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.4 / Unreleased
+## 0.7.5 / Unreleased
 
 * [Added]
 
@@ -10,10 +10,11 @@
 
 * [Fixed]
 
-## 0.7.3 / 2023-02-04
+## 0.7.4 / 2024-04-20
 
-* [Fixed] when sql parameter had multiple whitespaces than prepared_for_logs was changing them
-          to single space. https://github.com/sufleR/sql_query/pull/17
+* [Added] Remove upper restriction for rails
+
+## 0.7.3 no changes
 
 ## 0.7.2 / 2022-01-23
 

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,11 +46,7 @@ class SqlQuery
   end
 
   def prepared_for_logs
-    sql
-      .split("'")
-      .each_with_index
-      .map { |s, index| index % 2 == 0 ? s.gsub(/(\n|\s)+/, ' ') : s }
-      .join("'")
+    @sql_for_logs ||= prepare_query(true)
   end
 
   def partial(partial_name, partial_options = {})
@@ -79,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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe SqlQuery do
-  let(:options) { { email: "e@mail.dev ' " } }
+  let(:options) { { email: 'e@mail.dev' } }
   let(:file_name) { :get_player_by_email }
   let(:query) { described_class.new(file_name, options) }
 
@@ -13,7 +13,7 @@ describe SqlQuery do
 
   describe '#initialize' do
     it 'sets instance variables for all options' do
-      expect(query.instance_variable_get(:@email)).to eq options[:email]
+      expect(query.instance_variable_get(:@email)).to eq 'e@mail.dev'
     end
 
     context 'when options are set not in parentheses' do
@@ -82,7 +82,7 @@ describe SqlQuery do
   describe '#sql' do
     it 'returns query string' do
       expect(query.sql)
-        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev '' '\n")
+        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n")
     end
 
     context 'when file is .erb.sql' do
@@ -98,7 +98,7 @@ describe SqlQuery do
   describe '#pretty_sql' do
     it 'returns query string' do
       expect(query.pretty_sql)
-        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev '' '\n")
+        .to eq("SELECT *\nFROM players\nWHERE email = 'e@mail.dev'\n")
     end
   end
 
@@ -107,7 +107,7 @@ describe SqlQuery do
     it 'returns explain string' do
       expect(explain).to include 'EXPLAIN for:'
       expect(explain).to include 'FROM players'
-      expect(explain).to include "WHERE email = 'e@mail.dev '' '"
+      expect(explain).to include "WHERE email = 'e@mail.dev'"
       expect(explain).to include 'QUERY PLAN'
       expect(explain).to include 'Seq Scan on players'
     end
@@ -116,7 +116,7 @@ describe SqlQuery do
   describe '#execute' do
     before do
       ActiveRecord::Base.connection.execute(
-        "INSERT INTO players (email) VALUES ('e@mail.dev '' ')"
+        "INSERT INTO players (email) VALUES ('e@mail.dev')"
       )
     end
 
@@ -127,7 +127,7 @@ describe SqlQuery do
     end
 
     it 'returns data from database' do
-      expect(query.execute).to eq [{ 'email' => "e@mail.dev ' " }]
+      expect(query.execute).to eq [{ 'email' => 'e@mail.dev' }]
     end
 
     context 'when prepare argument is true' do
@@ -148,7 +148,7 @@ describe SqlQuery do
   describe '#exec_query' do
     before do
       ActiveRecord::Base.connection.execute(
-        "INSERT INTO players (email) VALUES ('e@mail.dev '' ')"
+        "INSERT INTO players (email) VALUES ('e@mail.dev')"
       )
     end
 
@@ -159,7 +159,7 @@ describe SqlQuery do
     end
 
     it 'returns data from database' do
-      expect(query.exec_query).to eq [{ 'email' => "e@mail.dev ' " }]
+      expect(query.exec_query).to eq [{ 'email' => 'e@mail.dev' }]
     end
 
     context 'when prepare argument is true' do
@@ -181,7 +181,7 @@ describe SqlQuery do
     let(:file_name) { :get_player_by_email_with_template }
     it 'resolves partials as parts of sql queries' do
       expect(query.sql)
-        .to eq("SELECT *\nFROM players\nWHERE players.email = 'e@mail.dev '' '\n\n")
+        .to eq("SELECT *\nFROM players\nWHERE players.email = 'e@mail.dev'\n\n")
     end
 
     context 'when partial name is string with file path' do
@@ -197,19 +197,18 @@ describe SqlQuery do
   end
 
   describe '#prepared_for_logs' do
-    let(:options) { { email: 'e@mail.dev    ' } }
-
     it 'returns string without new lines' do
       expect(query.prepared_for_logs)
-        .to eq("SELECT * FROM players WHERE email = 'e@mail.dev    ' ")
+        .to eq("SELECT * FROM players WHERE email = 'e@mail.dev' ")
     end
 
-    context 'when qote is inside parameter' do
-      let(:options) { { email: "e@mail.dev  '  " } }
+    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 new lines and changed parameter' do
+      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  ''  ' ")
+          .to eq("SELECT * FROM players WHERE email = '   e@mail.dev   ' ")
       end
     end
   end

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.3'
+  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.3
+  version: 0.7.4
 platform: ruby
 authors:
 - sufleR
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-04 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