active_sql_bindings 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aaf144f23edc98cb60202a23fdb601b4f714193f44d51088481983b24d98667
-  data.tar.gz: 33a2e654b7f2bbae4fd3bdc650631871b9bd1a93408982dd3904a32bbfac0735
+  metadata.gz: 197f5277c975f55258df8db121d1ce8dafde38d4c8fc74fbfec476d46f288bb9
+  data.tar.gz: 2e4eaccabaebb7392767cc9b4bab1797be694c87faffaf885c02e10e75149f51
 SHA512:
-  metadata.gz: 49fd556a8aaf3eb9ee32b7c2fa9a3486c01c03908cae2621eb33900908e8f45bc352b6bca9094b5735fe71746551e6e6c4c1cdac738f38cc4c006a816099b7ce
-  data.tar.gz: 6dbf72960efe999175f6e697cae610480504a796df1ae1afe6d229019c35e4531b3c126bd42a79e5d37158ca6ae1271b756a8bac50af57fea4ed910e515657a5
+  metadata.gz: 1318c8797e86802c3de00c4adf4a0b7e760f060955ef6bde5053e4038a5f75c887cf96e39a85d4c0ae9cf8582394edbeb186d9b00fda9020ac10ef9d20b40a36
+  data.tar.gz: 72086da0c63e25f3ba959fcfc10b98ede6351e4bd3e6a81abde0d0da1e199e48acd99a0037c925d3ec798f2396bc1286290f9d95a41f0c83dd23a6c9469875c4

data/lib/active_sql_bindings.rb

@@ -1,54 +1,91 @@
 # frozen_string_literal: true
 
-require 'rubygems'
 require 'active_record'
 
 # Class for work with SQL query.
 # You can use native SQL with bindings as hash.
 # Auto converting JSON fields to hash.
 class ActiveSqlBindings
-  # Create sql query with hash named bindings
-  #
-  # Example: ActiveSqlBindings.execute('SELECT name FROM test WHERE id = :id', id: id)
-  #
-  # @param [String] sql SQL query
-  # @param [Hash] bind bindings data for query
-  #
-  # @return [Array] executed SQL request data and return array with hashes
-  def self.execute(sql, bind = {})
-    bindings = []
-    bind_index = 1
-
-    # Get all bindings if exist
-    unless bind.empty?
-      bind.each do |key, value|
-        # Change name bind to $ bind
-        sql.gsub!(/(?<!:):#{key}(?=\b)/, "$#{bind_index}")
-        bind_index += 1
-
-        # Add new bind data
-        bindings << [nil, value]
+  class << self
+    # Create sql query with hash named bindings
+    #
+    # Example: ActiveSqlBindings.execute('SELECT name FROM test WHERE id = :id', id: id)
+    #
+    # @param [String] sql SQL query
+    # @param [Hash] bind bindings data for query
+    #
+    # @return [Array] executed SQL request data and return array with hashes
+    def execute(sql, bind = {})
+      bindings = []
+      bind_index = 1
+
+      # Get all bindings if exist
+      unless bind.empty?
+        bind.each do |key, value|
+          # Change name bind to $ bind
+          sql.gsub!(/(?<!:):#{key}(?=\b)/, "$#{bind_index}")
+          bind_index += 1
+
+          # Add new bind data
+          bindings << [nil, value]
+        end
       end
-    end
 
-    # Execute query, convert to hash with symbol keys
-    result = ActiveRecord::Base.connection.exec_query(sql, 'SQL', bindings).map(&:symbolize_keys)
+      # Execute query, convert to hash with symbol keys
+      sql_result = ActiveRecord::Base.connection.exec_query(sql, 'SQL', bindings)
+
+      # Find fields JSON/JSONb type
+      json_fields = sql_result.column_types.select { |_k, v| v.class.name.split('::').last.downcase.to_sym == :json || v.class.name.split('::').last.downcase.to_sym == :jsonb }.keys
 
-    # Convert JSON data to hash
-    result.map do |v|
-      next if v.nil?
+      # Find fields ARRAY type
+      array_fields = sql_result.column_types.select { |_k, v| v.class.name.split('::').last.downcase.to_sym == :array }.keys
 
-      v.each do |key, val|
-        v[key] = json_to_hash(val)
+      # Convert JSON data to hash
+      sql_result.map do |v|
+        v.map do |key, value|
+          [
+            key.to_sym,
+            check_fields(key: key, value: value, fields: { json: json_fields, array: array_fields })
+          ]
+        end.to_h
       end
     end
-  end
 
-  # Convert JSON to hash if correct data
-  #
-  # @param [String] json string
-  # @return [Hash] return hash if json is correct or input data
-  def self.json_to_hash(json)
-    JSON.parse(json, symbolize_names: true) rescue json
+    # Check fields' type and replace it
+    #
+    # @param [String] key for check type
+    # @param [String] value for converting
+    def check_fields(key:, value:, fields:)
+      return json_to_hash(value) if fields[:json].include?(key)
+      return postgres_to_array(value) if fields[:array].include?(key)
+
+      value
+    end
+
+    # Convert JSON to hash if correct data
+    #
+    # @param [String] json string
+    # @return [Hash] return hash if json is correct or input data
+    def json_to_hash(json)
+      JSON.parse(json, symbolize_names: true) rescue json
+    end
+
+    # Convert ruby array to Postgres array
+    #
+    # @param [Array] array data for converting
+    def array_to_postgres(array)
+      array = [array] if array.is_a?(String)
+
+      '{' + array.join(',') + '}'
+    end
+
+    # Convert Postgres array to ruby array
+    #
+    # @param [String] array string data for converting
+    def postgres_to_array(array)
+      return array.gsub(/[{}]/, '').split(',') if array.is_a?(String)
+
+      []
+    end
   end
 end

metadata

@@ -1,30 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: active_sql_bindings
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.6
 platform: ruby
 authors:
 - Danilevsky Kirill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 5.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-description: You can use native SQL query with named bindings
+        version: 5.13.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.3.2
+description: You can use native PostgreSQL query with named bindings
 email: k.danilevsky@gmail.com
 executables: []
 extensions: []
@@ -50,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Active SQL bindings gem