yesql 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85f1a89f06d3fa6d3a35471d895bce7860ed93988fa91d1f08149d349782e79
-  data.tar.gz: 4f6a7d1486495fe6291bddcfaa7d2fadbb051a79da98ba81c2e2a9958f3046ee
+  metadata.gz: 8f432f23ac16148c7439ec096a55c142c9985c537d06ef5ded891fb3178d3bbf
+  data.tar.gz: b5d82c03933a0401d4b24a3fd48f00ea3864adfb8566db7f73c518714784cc54
 SHA512:
-  metadata.gz: 0faf664927b4ed1c605f33a79f6e65b93b2bddd2bfea6c4f71cdeec8b9ae425c17111363ce95a74c715b468d89fb7e68b3bdf3041c3feaf76fe366556bb6592f
-  data.tar.gz: a1e04806de2b8b367c95f0167032a664315a8c1de57636855b430f702c84b1884432895f6393742e273c65b3dd9d54b9e35ac2e4e4c5ae59ec637caeac64509e
+  metadata.gz: '084397cf83aa10faf2d724a0be1c11548e36dd515932c4552498c130a96efb044ca5f498aa30d4ec9c002ea1f36c4ec3699bcd4e6e2db2313b0b56fab9da2ae5'
+  data.tar.gz: 70a91ebc63c23cd5c653351e728fc9c93207fd2583b1b72629d63717ba8e105c86318b016110f3040fd681b176da4d80db2807c40b4859ac3192c1a160901572

data/.gitignore

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

data/.rubocop.yml

@@ -0,0 +1,8 @@
+require: rubocop-rspec
+
+RSpec/FilePath:
+  Exclude:
+    - spec/**/*_spec.rb
+
+RSpec/NestedGroups:
+  Enabled: False

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yesql (0.1.4)
+    yesql (0.1.5)
       rails (>= 5.0)
 
 GEM

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].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/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,17 +1,17 @@
 # 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
-      include ::YeSQL::Common::Adapter
 
       # rubocop:disable Metrics/ParameterLists
       def initialize(bind_statement:,
@@ -23,11 +23,10 @@ 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
@@ -43,7 +42,6 @@ module YeSQL
       attr_reader :bind_statement,
                   :cache,
                   :cache_key,
-                  :connection,
                   :expires_in,
                   :file_path,
                   :named_bindings,
@@ -51,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
+          ::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
       end
 
-      # TODO: move this somewhere else.
       def binds
-        statement_binds(extractor)
-          .sort_by { |_, position| position.to_s.tr('$', '').to_i }
-          .tap { |x| break(mysql? ? x : x.uniq) }
-          .map(&:first)
-          .flatten
-          .each_slice(2)
-          .to_a
+        ::YeSQL::Bindings::Transformed.new(statement_binds: statement_binds(extractor)).call
       end
     end
   end

data/lib/yesql/query/result.rb

@@ -0,0 +1,43 @@
+# 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
+        @file_path = file_path
+        @prepare_option = prepare
+      end
+
+      def call
+        return rails5_result if ::Rails::VERSION::MAJOR == 5 && mysql?
+
+        exec_query(bind_statement, file_path, binds, prepare: prepare_option)
+      end
+
+      private
+
+      attr_reader :binds, :bind_statement, :file_path, :prepare_option
+
+      def_delegators(:connection, :exec_query, :raw_connection)
+      def_delegators(:raw_connection, :prepare)
+
+      def connection
+        ActiveRecord::Base.connection
+      end
+
+      def rails5_result
+        prepare(bind_statement).execute(*binds)
+      end
+    end
+  end
+end

data/lib/yesql/query/transform_result.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require 'yesql'
+require 'forwardable'
+
+module ::YeSQL
+  module Query
+    class TransformResult
+      extend Forwardable
+
+      def initialize(output:, result:)
+        @output = output
+        @result = result
+      end
+
+      def call
+        if ::Rails::VERSION::MAJOR == 5
+          return columns if columns?
+          return rows_values if rows?
+        end
+
+        return result.public_send(output.to_sym) if columns? || rows?
+
+        array_of_symbol_hashes
+      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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yesql
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Sebastián Palma
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -99,6 +100,7 @@ files:
 - 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
@@ -106,7 +108,10 @@ files:
 - 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/utils/read.rb
 - lib/yesql/version.rb
 - yesql.gemspec