yesql 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e080f284342f3ef4585f3763e069a7d716deb8c5ffbb0b3e3e06a15d2dcdafa3
-  data.tar.gz: a39131cd73c4df0e109071de38a87a284e688978ab8f8078611958677ccb7412
+  metadata.gz: d85f1a89f06d3fa6d3a35471d895bce7860ed93988fa91d1f08149d349782e79
+  data.tar.gz: 4f6a7d1486495fe6291bddcfaa7d2fadbb051a79da98ba81c2e2a9958f3046ee
 SHA512:
-  metadata.gz: 2d4800c0d99e16ca0302deff9a9ace0b453d1503b9ae9a9937936da56cc4084c3ce4194e98974384d53f9cac3f3866b41324661db49edd6ed777fc3f379bc1a5
-  data.tar.gz: 3c5cc66fb4fcbb8ab188f1c7057a2243e3df7d8ac84359327af44ae9d0ef812ab4c7a52b8c70f791a05bffe90efb7ebe5caaa8bae68cb038bd4b9bf1f7576044
+  metadata.gz: 0faf664927b4ed1c605f33a79f6e65b93b2bddd2bfea6c4f71cdeec8b9ae425c17111363ce95a74c715b468d89fb7e68b3bdf3041c3feaf76fe366556bb6592f
+  data.tar.gz: a1e04806de2b8b367c95f0167032a664315a8c1de57636855b430f702c84b1884432895f6393742e273c65b3dd9d54b9e35ac2e4e4c5ae59ec637caeac64509e

data/Gemfile.lock

@@ -1,62 +1,62 @@
 PATH
   remote: .
   specs:
-    yesql (0.1.3)
+    yesql (0.1.4)
       rails (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.3)
-      actionpack (= 6.0.3.3)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionmailbox (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.3)
-      actionview (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionpack (6.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actiontext (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.3)
-      activesupport (= 6.0.3.3)
+    activejob (6.0.3.4)
+      activesupport (= 6.0.3.4)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activestorage (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
+    activemodel (6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.3)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -84,6 +84,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
+    mysql2 (0.5.3)
     nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
@@ -94,29 +95,29 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.3)
-      actioncable (= 6.0.3.3)
-      actionmailbox (= 6.0.3.3)
-      actionmailer (= 6.0.3.3)
-      actionpack (= 6.0.3.3)
-      actiontext (= 6.0.3.3)
-      actionview (= 6.0.3.3)
-      activejob (= 6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activerecord (= 6.0.3.3)
-      activestorage (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.3)
+      railties (= 6.0.3.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.3)
-      actionpack (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
+    railties (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -155,6 +156,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  mysql2 (~> 0.5.3)
   pg (>= 0.18)
   pry (~> 0.13.1)
   rspec (~> 3.9.0)

data/README.md

@@ -70,7 +70,6 @@ YeSQL('top_10_users_in_x_country', { country: 'Cuba', country_id: 1, limit: 6 })
 ```
 
 - If the query doesn't have bindings, but they're provided they're just omitted.
-TODO: update this with link to the error.
 - If the query has bindings, but nothing is provided, it raises a `NotImplementedError` exception.
 
 
@@ -145,21 +144,21 @@ YeSQL('users', cache: { expires_in: 1.hour })
 
 ## Configuration
 
-For default `YeSQL` looks for the _.sql_ files defined under the `app/yesql/` folder but you can update it to use any folder you need. For that you can create a Ruby file under the `config/initializers/` folder as:
+For default `YeSQL` looks for the _.sql_ files defined under the `app/yesql/` folder but you can update it to use any folder you need. For that you can create a Ruby file under the `config/initializers/` with the following content:
 
 ```ruby
-YeSQL.config.path = 'path'
+::YeSQL.configure { |config| config.path = 'path' }
 ```
 
 After saving the file and restarting the server the files are going to be read from the given folder.
 
-You can check at anytime what's the configuration path by inspecting the YeSQL `config` object:
+You can check at anytime what's the configuration path by inspecting the ::YeSQL `config` object:
 
 ```ruby
-YeSQL.config
-# <Dry::Configurable::Config values={:path=>"path"}>
-Yesql.config.path
-# "path"
+::YeSQL.config
+# => #<YeSQL::Config::Configuration:0x00007feea1aa2ef8 @path="app/yesql">
+::YeSQL.config.path
+# => "app/yesql"
 ```
 
 
@@ -167,7 +166,7 @@ Yesql.config.path
 
 - Clone the repository.
 - Install the gem dependencies.
-- Make sure to create the database used in the dummy Rails application in the spec/ folder.
+- Make sure to create both databases used in the dummy Rails applications (mysql, pg) in the spec/ folder.
 - Run the tests.
 
 ## Contributing

data/lib/yesql.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
 require 'yesql/version'
 require 'yesql/config/configuration'
 require 'yesql/query/performer'

data/lib/yesql/bindings/extract.rb

@@ -2,9 +2,11 @@
 
 require 'yesql'
 
-module YeSQL
+module ::YeSQL
   module Bindings
     class Extract
+      include ::YeSQL::Common::Adapter
+
       def initialize(indexed_bindings, hash, index, value)
         @indexed_bindings = indexed_bindings
         @hash = hash
@@ -19,9 +21,15 @@ module YeSQL
       end
 
       def bind_vars
-        return "$#{last_val}" unless array?
+        if mysql?
+          return '?' unless array?
+
+          Array.new(value.size, '?').join(', ')
+        elsif pg?
+          return "$#{last_val}" unless array?
 
-        value.map.with_index(bind_index) { |_, i| "$#{i}" }.join(', ')
+          value.map.with_index(bind_index) { |_, i| "$#{i}" }.join(', ')
+        end
       end
 
       def last_val

data/lib/yesql/common/adapter.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+module ::YeSQL
+  module Common
+    module Adapter
+      extend Forwardable
+
+      # `adapter` might be a complex object, but
+      # for the sake of brevity it's just a string
+      def adapter
+        ::ActiveRecord::Base.connection.adapter_name
+      end
+
+      def mysql?
+        adapter == 'Mysql2'
+      end
+
+      def pg?
+        adapter == 'PostgreSQL'
+      end
+    end
+  end
+end

data/lib/yesql/query/performer.rb

@@ -3,6 +3,7 @@
 require 'yesql'
 require 'forwardable'
 require 'yesql/bindings/utils'
+require 'yesql/common/adapter'
 
 module YeSQL
   module Query
@@ -10,6 +11,7 @@ module YeSQL
       extend Forwardable
 
       include ::YeSQL::Bindings::Utils
+      include ::YeSQL::Common::Adapter
 
       # rubocop:disable Metrics/ParameterLists
       def initialize(bind_statement:,
@@ -74,8 +76,8 @@ module YeSQL
       # TODO: move this somewhere else.
       def binds
         statement_binds(extractor)
-          .sort_by { |_, position| position.tr('$', '').to_i }
-          .uniq
+          .sort_by { |_, position| position.to_s.tr('$', '').to_i }
+          .tap { |x| break(mysql? ? x : x.uniq) }
           .map(&:first)
           .flatten
           .each_slice(2)

data/lib/yesql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module YeSQL
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/yesql.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.add_dependency 'rails', '>= 5.0'
+  spec.add_development_dependency 'mysql2', '~> 0.5.3'
   spec.add_development_dependency 'pg', '>= 0.18'
   spec.add_development_dependency 'pry', '~> 0.13.1'
   spec.add_development_dependency 'rspec', '~> 3.9.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Sebastián Palma
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +100,7 @@ files:
 - lib/yesql/bindings/extract.rb
 - lib/yesql/bindings/extractor.rb
 - lib/yesql/bindings/utils.rb
+- lib/yesql/common/adapter.rb
 - lib/yesql/config/configuration.rb
 - lib/yesql/errors/cache_expiration_error.rb
 - lib/yesql/errors/file_path_does_not_exist_error.rb