yesql 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f34614332a4d7180b1ef1eee59ee5745706bd7c4f6a8aae1ad1dd3ad729c75e
-  data.tar.gz: 8600ffe5021418c3d2ac822d78744cedcc9d6116da7c9168fde36c711e783582
+  metadata.gz: 52fad054eefb567edd4b4516c9020170f69adfc7f3e9bd5bc3fbb48c529c4ee8
+  data.tar.gz: 4aba16fea0544f89a2b431eea2af65946e99675065692cbb20f4ffde1e2f6cf1
 SHA512:
-  metadata.gz: f9c9cb626349ef40ec0ad7ba2c13b034d6844def674ec86d52047cedf53a6241f2022c070f0dc7f329a8c89329553754f88870e8ee61493a6a3708e0f5328e9f
-  data.tar.gz: 997cb3883fabfcb39ecd36d80ae9df990a331bbc8254edac4618bbc1f58e2b9c9971430a9f8d2bd29f3a30ac2a86d7700a0eedd1a2c5a840f406644824aef954
+  metadata.gz: a5c739cb79f30e6e9165de184e34f23394959933792aac33ada3829438cde7ad21639d257a3e5e78fd5ae3badf7eb5652ffaa5ee6348f4c4e349acd9140682f2
+  data.tar.gz: 32673b4339aa6b0f3a71b61ec3ab7fe726f9df58f83c2c68fe142cf2b3a267d4369853e6011582d334723d222e9d59caa99916c64cb09e364e5991a5700d1a1f

data/.gitignore

@@ -0,0 +1,4 @@
+spec/minimalpg/log/*
+spec/minimalmysql/log/*
+spec/minimalpg/db/*
+spec/minimalmysql/db/*

data/.rubocop.yml

@@ -0,0 +1,20 @@
+require: rubocop-rspec
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb
+    - spec/spec_helper.rb
+    - spec/yesql/shared/*
+
+RSpec/FilePath:
+  Exclude:
+    - spec/**/*_spec.rb
+
+RSpec/NestedGroups:
+  Enabled: False
+
+RSpec/ExampleLength:
+  Enabled: False
+
+RSpec/BeforeAfterAll:
+  Enabled: False

data/Gemfile.lock

@@ -1,63 +1,62 @@
 PATH
   remote: .
   specs:
-    yesql (0.1.0)
-      dry-configurable (~> 0.11.6)
+    yesql (0.1.7)
       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)
@@ -65,22 +64,15 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.1.8)
     crass (1.0.6)
     diff-lcs (1.4.4)
-    dry-configurable (0.11.6)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
-    erubi (1.9.0)
+    erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.8.5)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    loofah (2.7.0)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -90,45 +82,46 @@ GEM
     method_source (1.0.0)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nio4r (2.5.3)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    nio4r (2.5.7)
+    nokogiri (1.11.2-x86_64-darwin)
+      racc (~> 1.4)
     pg (1.2.3)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.5.2)
     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)
-    rake (13.0.1)
+    rake (13.0.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -149,20 +142,21 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     yard (0.9.25)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  mysql2 (~> 0.5.3)
   pg (>= 0.18)
   pry (~> 0.13.1)
   rspec (~> 3.9.0)
@@ -170,4 +164,4 @@ DEPENDENCIES
   yesql!
 
 BUNDLED WITH
-   2.1.4
+   2.2.3

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,25 +1,21 @@
 # frozen_string_literal: true
 
-require 'dry-configurable'
-require 'pry'
+require 'yesql/statement'
 require 'yesql/version'
+require 'yesql/config/configuration'
 require 'yesql/query/performer'
 require 'yesql/errors/cache_expiration_error'
 require 'yesql/errors/file_path_does_not_exist_error'
 require 'yesql/errors/no_bindings_provided_error'
 require 'yesql/errors/output_argument_error'
-require 'yesql/bindings/binder'
 
 module YeSQL
-  extend ::Dry::Configurable
-
+  include ::YeSQL::Config
   include ::YeSQL::Errors::CacheExpirationError
   include ::YeSQL::Errors::FilePathDoesNotExistError
   include ::YeSQL::Errors::NoBindingsProvidedError
   include ::YeSQL::Errors::OutputArgumentError
 
-  setting :path, 'app/yesql'
-
   BIND_REGEX = /(?<!:):(\w+)(?=\b)/.freeze
 
   # rubocop:disable Naming/MethodName
@@ -44,7 +40,7 @@ module YeSQL
   def execute(bindings, cache, file_path, output, options)
     ::YeSQL::Query::Performer.new(
       bindings: bindings,
-      bind_statement: ::YeSQL::Bindings::Binder.bind_statement(file_path, bindings),
+      bind_statement: ::YeSQL::Statement.new(bindings, file_path),
       cache: cache,
       file_path: file_path,
       output: output,

data/lib/yesql/bindings/extract.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'yesql'
+require 'yesql/common/adapter'
 
-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 +22,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/bindings/transformed.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'yesql'
+require 'yesql/common/adapter'
+
+module ::YeSQL
+  module Bindings
+    class Transformed
+      include ::YeSQL::Common::Adapter
+
+      def initialize(statement_binds:)
+        @statement_binds = statement_binds
+      end
+
+      def call
+        return mysql_rails5_binds if rails5? && mysql?
+        return mysql_binds if !rails5? && mysql?
+
+        pg_binds
+      end
+
+      private
+
+      attr_reader :statement_binds
+
+      def rails5?
+        ::Rails::VERSION::MAJOR == 5
+      end
+
+      def mysql_rails5_binds
+        statement_binds
+          .map(&:first)
+          .flatten(1)
+          .each_slice(2)
+          .flat_map do |first, last|
+            next [first, last].compact.map(&:last) if first.is_a?(Array)
+
+            last
+          end
+      end
+
+      def mysql_binds
+        statement_binds
+          .map(&:first)
+          .flatten
+          .each_slice(2)
+          .to_a
+      end
+
+      def pg_binds
+        statement_binds
+          .sort_by { |_, position| position.to_s.tr('$', '').to_i }
+          .uniq
+          .map(&:first)
+          .flatten
+          .each_slice(2)
+          .to_a
+      end
+    end
+  end
+end

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/config/configuration.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module ::YeSQL
+  module Config
+    class Configuration
+      attr_accessor :path
+
+      DEFAULT_PATH = 'app/yesql'
+
+      def initialize
+        @path = DEFAULT_PATH
+      end
+    end
+  end
+
+  class << self
+    def config
+      @config ||= ::YeSQL::Configuration.new
+    end
+
+    def configure
+      yield config if block_given?
+    end
+
+    def reset_config
+      tap do |conf|
+        conf.configure do |configuration|
+          configuration.path = ::YeSQL::Configuration::DEFAULT_PATH
+        end
+      end
+    end
+  end
+end

data/lib/yesql/errors/no_bindings_provided_error.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
-module YeSQL
+require 'yesql/utils/read'
+
+module ::YeSQL
   module Errors
     module NoBindingsProvidedError
       def validate_statement_bindings(binds, file_path)
         return unless statement_binds(file_path).size.positive?
 
         format(MESSAGE, renderable_statement_binds(file_path)).tap do |message|
-          raise ArgumentError, message unless binds.is_a?(Hash) && !binds.empty?
+          raise ::ArgumentError, message unless binds.is_a?(::Hash) && !binds.empty?
         end
       end
 

data/lib/yesql/params/output.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'yesql'
+require 'forwardable'
+
+module ::YeSQL
+  module Params
+    class Output
+      extend Forwardable
+
+      def initialize(output)
+        @output = output.to_s
+      end
+
+      def columns?
+        output == 'columns'
+      end
+
+      def rows?
+        output == 'rows'
+      end
+
+      def hash?
+        output == 'hash'
+      end
+
+      def_delegator(:output, :to_sym)
+
+      private
+
+      attr_reader :output
+    end
+  end
+end

data/lib/yesql/query/performer.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
 require 'yesql'
-require 'forwardable'
 require 'yesql/bindings/utils'
+require 'yesql/common/adapter'
+require 'yesql/bindings/transformed'
+require 'yesql/query/result'
+require 'yesql/query/transform_result'
+require 'yesql/params/output'
 
 module YeSQL
   module Query
     class Performer
-      extend Forwardable
-
       include ::YeSQL::Bindings::Utils
 
       # rubocop:disable Metrics/ParameterLists
@@ -21,19 +23,18 @@ module YeSQL
         @bind_statement = bind_statement
         @cache = cache
         @cache_key = cache[:key] || file_path
-        @connection = ActiveRecord::Base.connection
         @expires_in = cache[:expires_in]
         @file_path = file_path
         @named_bindings = bindings.transform_keys(&:to_sym)
-        @output = output
+        @output = ::YeSQL::Params::Output.new(output)
         @prepare = prepare
       end
       # rubocop:enable Metrics/ParameterLists
 
       def call
-        return modified_output if cache.empty?
+        return transformed_result if cache.empty?
 
-        Rails.cache.fetch(cache_key, expires_in: expires_in) { modified_output }
+        Rails.cache.fetch(cache_key, expires_in: expires_in) { transformed_result }
       end
 
       private
@@ -41,7 +42,6 @@ module YeSQL
       attr_reader :bind_statement,
                   :cache,
                   :cache_key,
-                  :connection,
                   :expires_in,
                   :file_path,
                   :named_bindings,
@@ -49,37 +49,24 @@ module YeSQL
                   :prepare,
                   :rows
 
-      def_delegator(:query_result, :columns)
-      private :columns
-      def_delegator(:query_result, :rows)
-      private :rows
-
-      def modified_output
-        @modified_output ||=
-          begin
-            return query_result.public_send(output) if %w[columns rows].include?(output.to_s)
-
-            columns.map(&:to_sym).tap { |cols| break rows.map { |row| cols.zip(row).to_h } }
-          end
+      def transformed_result
+        @transformed_result ||=
+          ::YeSQL::Query::TransformResult.new(output: output, result: query_result).call
       end
 
       def query_result
-        @query_result ||= connection.exec_query(bind_statement, file_path, binds, prepare: prepare)
+        @query_result ||= ::YeSQL::Query::Result.new(binds: binds,
+                                                     bind_statement: bind_statement,
+                                                     file_path: file_path,
+                                                     prepare: prepare).call
       end
 
-      def extractor
-        ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
+      def binds
+        ::YeSQL::Bindings::Transformed.new(statement_binds: statement_binds(extractor)).call
       end
 
-      # TODO: move this somewhere else.
-      def binds
-        statement_binds(extractor)
-          .sort_by { |_, position| position.tr('$', '').to_i }
-          .uniq
-          .map(&:first)
-          .flatten
-          .each_slice(2)
-          .to_a
+      def extractor
+        ::YeSQL::Bindings::Extractor.new(bindings: named_bindings).call
       end
     end
   end

data/lib/yesql/query/result.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'yesql'
+require 'forwardable'
+require 'yesql/common/adapter'
+
+module ::YeSQL
+  module Query
+    class Result
+      extend Forwardable
+
+      include ::YeSQL::Common::Adapter
+
+      def initialize(binds: [], bind_statement:, file_path:, prepare:)
+        @binds = binds
+        @bind_statement = bind_statement
+        @connection = ActiveRecord::Base.connection
+        @file_path = file_path
+        @prepare_option = prepare
+      end
+
+      def call
+        return view_result   if view?
+        return rails5_result if ::Rails::VERSION::MAJOR == 5 && mysql?
+
+        exec_query(bound, file_path, binds, prepare: prepare_option)
+      end
+
+      private
+
+      attr_reader :binds, :bind_statement, :connection, :file_path, :prepare_option
+
+      def_delegators(:bind_statement, :bound, :to_s, :view?)
+      def_delegators(:connection,     :exec_query, :raw_connection)
+      def_delegators(:raw_connection, :prepare)
+
+      def view_result
+        exec_query(bound)
+      end
+
+      def rails5_result
+        prepare(bound).execute(*binds)
+      end
+    end
+  end
+end

data/lib/yesql/query/transform_result.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'yesql'
+require 'yesql/common/adapter'
+require 'forwardable'
+
+module ::YeSQL
+  module Query
+    class TransformResult
+      extend Forwardable
+
+      include ::YeSQL::Common::Adapter
+
+      def initialize(output:, result:)
+        @output = output
+        @result = result
+      end
+
+      def call
+        if ::Rails::VERSION::MAJOR == 5 && mysql?
+          return columns if columns?
+          return rows_values if rows?
+          return array_of_symbol_hashes if hash?
+        end
+
+        return result.public_send(output.to_sym) if columns? || rows?
+
+        to_a.map(&:symbolize_keys)
+      end
+
+      private
+
+      attr_reader :output, :result
+
+      def_delegators(:result, :rows, :to_a)
+      def_delegators(:output, :columns?, :hash?, :rows?)
+
+      def rows_values
+        to_a.map { |e| e.respond_to?(:values) ? e.values : e }
+      end
+
+      def array_of_symbol_hashes
+        to_a.tap { |rows| break hashed_rows(rows) if ::Rails::VERSION::MAJOR == 5 }
+            .map { |e| e.respond_to?(:symbolize_keys) ? e.symbolize_keys : e }
+      end
+
+      def hashed_rows(rows)
+        rows.map { |row| columns.zip(row).to_h }
+      end
+
+      def columns
+        return result.fields if result.respond_to?(:fields)
+
+        result.columns
+      end
+    end
+  end
+end

data/lib/yesql/statement.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+
+require 'yesql/utils/read'
+require 'yesql/bindings/extractor'
+require 'yesql/common/adapter'
+
+module ::YeSQL
+  class Statement
+    extend Forwardable
+
+    include ::YeSQL::Common::Adapter
+
+    def initialize(bindings = {}, file_path)
+      @bindings = bindings
+      @connection = ::ActiveRecord::Base.connection
+      @file_path = file_path
+    end
+
+    def bound
+      to_s.gsub(::YeSQL::BIND_REGEX) do |match|
+        extractor[match[/(\w+)/].to_sym].tap do |extract|
+          break quote(extract[:value]) if view?
+
+          break extract[:bind][:vars]
+        end
+      end
+    end
+
+    def to_s
+      @to_s ||= ::YeSQL::Utils::Read.statement(file_path, readable: true)
+    end
+
+    def view?
+      to_s =~ /^create\s.*view\s/i
+    end
+
+    private
+
+    def_delegator(:connection, :quote)
+
+    attr_reader :bindings, :connection, :file_path
+
+    def extractor
+      ::YeSQL::Bindings::Extractor.new(bindings: bindings).call
+    end
+  end
+end

data/lib/yesql/version.rb

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

data/yesql.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.bindir = 'exe'
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'dry-configurable', '~> 0.11.6'
   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,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Sebastián Palma
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-15 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
+        version: 0.5.3
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -95,15 +97,21 @@ files:
 - bin/console
 - bin/setup
 - lib/yesql.rb
-- lib/yesql/bindings/binder.rb
 - lib/yesql/bindings/extract.rb
 - lib/yesql/bindings/extractor.rb
+- lib/yesql/bindings/transformed.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
 - lib/yesql/errors/no_bindings_provided_error.rb
 - lib/yesql/errors/output_argument_error.rb
+- lib/yesql/params/output.rb
 - lib/yesql/query/performer.rb
+- lib/yesql/query/result.rb
+- lib/yesql/query/transform_result.rb
+- lib/yesql/statement.rb
 - lib/yesql/utils/read.rb
 - lib/yesql/version.rb
 - yesql.gemspec
@@ -129,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby library to use SQL

data/lib/yesql/bindings/binder.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-require 'yesql/utils/read'
-require 'yesql/bindings/extractor'
-
-module YeSQL
-  module Bindings
-    class Binder
-      def self.bind_statement(file_path, bindings)
-        ::YeSQL::Bindings::Extractor.new(bindings: bindings).call.tap do |extractor|
-          break ::YeSQL::Utils::Read.statement(file_path, readable: true)
-                                    .gsub(::YeSQL::BIND_REGEX) do |match|
-                                      extractor[match[/(\w+)/].to_sym][:bind][:vars]
-                                    end
-        end
-      end
-    end
-  end
-end