active_sql_bindings 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8cabb420ed7c20634aea656e5fc73860c4873821448e2880417ee5a1ae19637
-  data.tar.gz: c84ed030038c3b1be486a9e74e2303242b68d8344e7a4135378b25e61863c61b
+  metadata.gz: b1906c6795e1f1f02c1ad0ea0085624656dbb293c12e725ca1ee7d0211bfda96
+  data.tar.gz: d5a32f32e11fde42526e9dbbea112942c2b11adb0759af42e4829f6369ca9134
 SHA512:
-  metadata.gz: 2db7501bd65cc82635210bab845081d5e5867012b58520b0e35dfd875b6f95f1032d3ef32b60b1fff3bf9be958861c49888c92ea0ff58d1867c5c495ae2c0980
-  data.tar.gz: 06c6448a3bf4c9a99fcc7535ef107529f51430a4d77e1dd5e71e8ab76abb8067efed5756a1de2680c5f6dadfd271330067cd2005fb4328cfe03e41088a9ed0b3
+  metadata.gz: 3d75216869fd7a6e7961ff6dd006bd7b81a9d18f19966ec440df53cad6702fe718fbbcb8ccb200fda2ce7d4ec6d1cdf0def77fc45506a1a077720578104b354a
+  data.tar.gz: 0f6799b0ac7329146cb49b32a351587ade0332c5c4033d0aba74a16d58a38a0ef1a8766c8de53b72a6c6198d04b89de7b48955580f9dafe3b78bbfd128312883

data/lib/active_sql_bindings.rb

@@ -6,52 +6,86 @@ require 'active_record'
 # 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
+
+      # 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
+
+      # Find fields ARRAY type
+      array_fields = sql_result.column_types.select { |_k, v| v.class.name.split('::').last.downcase.to_sym == :array }.keys
+
+      # 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
 
-    # Execute query, convert to hash with symbol keys
-    sql_result = ActiveRecord::Base.connection.exec_query(sql, 'SQL', bindings)
+    # 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)
 
-    # Find fields JSON/JSONb type
-    json_fields = sql_result.column_types.select { |_k, v| v.type == :json || v.type == :jsonb }.keys
+      value
+    end
 
-    # Convert JSON data to hash
-    sql_result.map do |v|
-      v.map do |key, value|
-        [
-          key.to_sym,
-          json_fields.include?(key) ? json_to_hash(value) : value
-        ]
-      end.to_h
+    # 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
-  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
+    # 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_sql_bindings
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Danilevsky Kirill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.2
-description: You can use native SQL query with named bindings
+description: You can use native PostgreSQL query with named bindings
 email: k.danilevsky@gmail.com
 executables: []
 extensions: []
@@ -78,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