dynamic-records-meritfront 3.1.33 → 3.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dfcf5de90cdcac42af2c68794fd94b2d97976edabebc30c7af030b03a4cc26f
-  data.tar.gz: 62d372644b0997607dc8cb73e4c95e0c29b4942b7519bea26cdfc3e960007899
+  metadata.gz: 4c89216cc9c88e455670f35269bc949eb5e0bc1ac6ce04e02a3b03eb5d00b654
+  data.tar.gz: 3a943f93bb7c7fbfdf3d469afa0d5577e795dde5761d1b63229c8aa94fb60cfe
 SHA512:
-  metadata.gz: 2eb9f39a73f585d769ac0e65f123f995a19d0129659e18b2d3978eb85668a32754ef859b3bef162d063c2cd720b4684e85247979ab3422485a179314566a2128
-  data.tar.gz: d70133876b5a852d6e3e6d73d9a4d76818e078ef5b46b0dc530a36801a48caa73764f9cc275794c75d6409a96dc4a5a67ad201d72f0741111dbc0f895b93463c
+  metadata.gz: 698dc9dc2d4cf602cd54e2b7633062177e7773095b3e94b06188c4d06a82bdea83df074af16f0b95c060f461c8ef82f7a7c272d3fa8d738660e62472118a9733
+  data.tar.gz: b49b8029d106e0dd729520fc2985be6e562a1a1b8f80028e3c13d1efb15a68ff539abe7be0826a3871e9eed34a068ea516ede0e5634960889ff9437c6c876f87

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dynamic-records-meritfront (3.1.33)
+    dynamic-records-meritfront (3.1.34)
       hashid-rails
 
 GEM
@@ -24,7 +24,7 @@ GEM
       mutex_m
       tzinfo (~> 2.0)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     drb (2.2.1)
@@ -32,12 +32,10 @@ GEM
       activerecord (>= 4.0)
       hashids (~> 1.0)
     hashids (1.0.6)
-    i18n (1.14.3)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-      racc (~> 1.7)
-    minitest (5.22.2)
+    minitest (5.22.3)
     mutex_m (0.2.0)
-    racc (1.7.3)
     rake (12.3.3)
     timeout (0.4.1)
     tzinfo (2.0.6)

data/lib/dynamic-records-meritfront/version.rb

@@ -1,5 +1,5 @@
 
 	module DynamicRecordsMeritfront
-	    VERSION = '3.1.33'
+	    VERSION = '3.1.34'
 	end
 	#this file gets overwritten automatically on minor updates, major ones need to be manually changed

data/lib/dynamic-records-meritfront.rb

@@ -595,7 +595,11 @@ module DynamicRecordsMeritfront
         def _dynamic_instaload_handle_with_statements(with_statements)
             %Q{WITH #{
     with_statements.map{|ws|
-        "#{ws[:table_name]} AS (\n#{ws[:sql]}\n)"
+			if(ws[:with])
+				"#{ws[:with]} AS (\n#{ws[:sql]}\n)"
+			else
+        		"#{ws[:table_name]} AS (\n#{ws[:sql]}\n)"
+			end
     }.join(", \n")
 }}
         end
@@ -615,13 +619,13 @@ module DynamicRecordsMeritfront
             #{ other_statements.map{|os| "SELECT row_to_json(#{os[:table_name]}.*) AS row, '#{os[:klass]}' AS _klass FROM (\n#{os[:sql]}\n)) AS #{os[:table_name]}\n" }.join(' UNION ALL ')}
         end
 
-        def instaload(sql, table_name: nil, relied_on: false, dont_return: false, base_name: nil, base_on: nil, attach_on: nil, one_to_one: false, as: nil)
+        def instaload(sql, table_name: nil, relied_on: false, dont_return: false, base_name: nil, base_on: nil, attach_on: nil, one_to_one: false, as: nil, with: nil)
             #this function just makes everything a little easier to deal with by providing defaults, making it nicer to call, and converting potential symbols to strings.
             #At the end of the day it just returns a hash with the settings in it though. So dont overthink it too much.
 
             as = as.to_s if as
             base_name = base_name.to_s if base_name
-            
+
             if table_name
                 table_name = table_name.to_s
             else
@@ -633,7 +637,8 @@ module DynamicRecordsMeritfront
             sql = "\t" + sql.strip
             raise StandardError.new("base_on needs to be nil or a Proc") unless base_on.nil? or base_on.kind_of? Proc
             raise StandardError.new("attach_on needs to be nil or a Proc") unless attach_on.nil? or attach_on.kind_of? Proc
-            return {table_name: table_name, klass: klass, sql: sql, relied_on: relied_on, dont_return: dont_return, base_name: base_name, base_on: base_on, attach_on: attach_on, one_to_one: one_to_one, as: as}
+            return { table_name: table_name, klass: klass, sql: sql, relied_on: relied_on, dont_return: dont_return,
+				base_name: base_name, base_on: base_on, attach_on: attach_on, one_to_one: one_to_one, as: as, with: with }
         end
 
         def instaload_sql(*args) #name, insta_array, opts = { })
@@ -647,7 +652,7 @@ module DynamicRecordsMeritfront
                 raise StandardError.new("bad input to DynamicRecordsMeritfront#instaload_sql method.")
             end
 
-            with_statements = insta_array.select{|a| a[:relied_on]}
+            with_statements = insta_array.select{|a| a[:relied_on] or a[:with]}
             sql = %Q{
 #{ _dynamic_instaload_handle_with_statements(with_statements) if with_statements.any? }
 #{ _dynamic_instaload_union(insta_array)}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic-records-meritfront
 version: !ruby/object:Gem::Version
-  version: 3.1.33
+  version: 3.1.34
 platform: ruby
 authors:
 - Luke Clancy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashid-rails