hadouken-json 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62fef84a45118f2f47cbd64a3634580aac3a563a172badedc5cc546afd560e54
-  data.tar.gz: a9350818a683f0b13f8ec0cdc1ed7b0f3c8d4d3932968713669f9382344977e8
+  metadata.gz: 5134ad4ac55b205d681920316af6eecf2c2daa787ed32fd6638ed67cafbc3790
+  data.tar.gz: e61fedaa590de97485d3db9d94a56ac734570734b370c5dd2ed17bae353bc8f3
 SHA512:
-  metadata.gz: 915c7205d38b350c6120eac7cb4aaec445e79d70601143ec08fdbeb2866b56e3aa23bd27520273b84bb7f5a8c57ba1b08eee46596d030f1e0bca64fc134dcce8
-  data.tar.gz: 20cd69fb5a7045761e111c630037caca265f89dba328e352895bf801079d0ce75789e61197458255f5526f9ee169d6ca484c105f28e8e9d76acf40306e2329a4
+  metadata.gz: 1b14b24f94168ec7f5b30aa6eec22d6253288f9a28dbea7657bcc3fc2d5faffbd4700d694234cd1eab5ce5ff7b42daa6abd874b4d7fc44e0f8ea6eb99bd88f08
+  data.tar.gz: fe6f9cd046066da882f19a39cd3edc64fab4c58ff724d60c56c4b57086ce73883b254e539255eea8acb575040d034adb969f29826650d00fb131990421752e6f

data/lib/hadouken/json.rb

@@ -21,7 +21,8 @@ class Hadouken::Json
       main_class: (relation_for(options[:jsonb_field_from]) || relation).klass,
       scope: options[:for],
       schema: json_schema,
-      decorator: (options[:decorate_with].is_a?(Hadouken::Decorator) ? options[:decorate_with] : nil)
+      decorator: (options[:decorate_with].is_a?(Hadouken::Decorator) ? options[:decorate_with] : nil),
+      where_condition: options[:where]
     )
   end
 

data/lib/hadouken/sql_builder.rb

@@ -5,6 +5,7 @@ class Hadouken::SqlBuilder
   attribute :scope
   attribute :schema, Hash, default: {}
   attribute :decorator, Hadouken::Decorator
+  attribute :where_condition, Hash
 
   def self.call(*args)
     new(*args).call
@@ -16,6 +17,7 @@ class Hadouken::SqlBuilder
     @sql = ''
     @relation = build_relation
     apply_decorator if decorator&.valid?
+    apply_where_conditions
     @sql << @relation.select(*columns_to_select).to_sql.gsub(sample_id.to_s, primary_key)
 
     "SELECT COALESCE(json_agg(a), '[]'::JSON ) FROM (#{@sql}) a"
@@ -43,6 +45,13 @@ class Hadouken::SqlBuilder
     EOQ
   end
 
+  def apply_where_conditions
+    return unless where_condition.is_a?(Hash) && where_condition.any?
+
+    where_condition.deep_transform_keys! { |k| [unwound_jsonb_table_name,k.to_s].join('.') } if scope_is_jsonb_array?
+    @relation.where!(where_condition)
+  end
+
   def apply_decorator
     @sql << decorator.data_table_sql
     @relation.joins!(decorator.join_sql)
@@ -59,7 +68,7 @@ class Hadouken::SqlBuilder
     schema.extract!(*schema.select{ |_,v| v.is_a?(String) }.keys)
           .inject({}) do |h, (field, column)|
             col = (@relation&.klass&.column_names||[]).include?(column) ? [@relation.klass.table_name, column].join('.') : column
-            scope_is_jsonb_array? ? h.merge(field => "#{unwound_jsonb_table_name}.#{column.split('::')[0]}") : h.merge(field => col)
+            scope_is_jsonb_array? ? h.merge(field => "#{unwound_jsonb_table_name}.#{column}") : h.merge(field => col)
           end
   end
 
@@ -116,12 +125,15 @@ class Hadouken::SqlBuilder
   end
 
   def unwound_jsonb_table_name
-    @unwound_jsonb_table_name ||= ['array_from_', scope].join
+    ['records_from', scope].join('_')
+  end
+
+  def jsonb_type
+    [main_class.table_name, scope].join('_')
   end
 
   def unwound_jsonb_table
-    table_structure = schema.values.map { |v| v.split('::').push('text')[0..1].join(' ') }.join(', ') 
-    "jsonb_to_recordset(#{main_class.table_name}.#{scope}) AS #{unwound_jsonb_table_name}(#{table_structure})"
+    "jsonb_populate_recordset(null::#{jsonb_type}, #{main_class.table_name}.#{scope}) AS #{unwound_jsonb_table_name}"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hadouken-json
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roman Zaytsev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus