dynamic-records-meritfront 3.1.29 → 3.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e329f6fa51f14843549a6d3681870a99a5e1b9ff78af32281ca8a5433122922
-  data.tar.gz: 5c14dc25ee35ea526f220d5b727032dcaf1be0f1bb744c080c9a12c4a70b15bb
+  metadata.gz: 4c89216cc9c88e455670f35269bc949eb5e0bc1ac6ce04e02a3b03eb5d00b654
+  data.tar.gz: 3a943f93bb7c7fbfdf3d469afa0d5577e795dde5761d1b63229c8aa94fb60cfe
 SHA512:
-  metadata.gz: 19070cbac3c6442ba5ba82c28d370efe9a3cc6cfd0e6a05e5a74175982000484baa804baceb187b00badb865ba57e6f9059bf878670c518830c97ea904157779
-  data.tar.gz: 85892bfa3f8708bbb683297513ffb0f10650ad389084a219203241918e52208041c29a477e478027e3f841e0235b983fd1948f1ff65389b34efcbe18c531b805
+  metadata.gz: 698dc9dc2d4cf602cd54e2b7633062177e7773095b3e94b06188c4d06a82bdea83df074af16f0b95c060f461c8ef82f7a7c272d3fa8d738660e62472118a9733
+  data.tar.gz: b49b8029d106e0dd729520fc2985be6e562a1a1b8f80028e3c13d1efb15a68ff539abe7be0826a3871e9eed34a068ea516ede0e5634960889ff9437c6c876f87

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    dynamic-records-meritfront (3.1.29)
+    dynamic-records-meritfront (3.1.34)
       hashid-rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -23,23 +23,21 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
-    concurrent-ruby (1.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
-    drb (2.1.1)
-      ruby2_keywords
+    drb (2.2.1)
     hashid-rails (1.4.1)
       activerecord (>= 4.0)
       hashids (~> 1.0)
     hashids (1.0.6)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
+    minitest (5.22.3)
+    mutex_m (0.2.0)
     rake (12.3.3)
-    ruby2_keywords (0.0.5)
-    timeout (0.4.0)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
 

data/README.md

@@ -536,7 +536,9 @@ v3.0.6
 - warning messages for dynamic_attach. to_s'd any provided table_names for ease-of-use.
 - logging info for dynamic_attach outside of instaload.
 - fixed an error where instaload only worked with ApplicationRecord abstract_class. Now works on anything thats a subclass of ActiveRecord::Base
-- wow
+
+3.2
+- Updates so the latest version of the pg gem and rails works with the latest version of postgresql
 
 
 ## Questions
@@ -545,7 +547,7 @@ v3.0.6
 - Q: The default name of my sql statements looks like a stack trace? Whats going on?
 - A: We set the location of where you called the function as the default name for easy debugging. Its not an error, we just take some info from the stacktrace. It also includes the method name which can provide some insite into what the query is doing. Makes logs alot nicer to look at.
 - Q: Whats MeritFront?
-- A: I am making a social media platform. See meritfront.com, Its soft launched.
+- A: I am making a social media platform. Its called midflip now. See midflip.io
 - Q: Inspect on user records doesn't seem to work properly
 - A: inspect is overwritten by many diffrent libraries, in terms of devise for example, they override our override of active record's inspect. The best way to deal with this is to look at the source location of these methods and bring them together (user.method(:inspect).source_location). In my case with devise, i ended up with this in the user record:
 ```ruby

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

@@ -1,5 +1,5 @@
 
 	module DynamicRecordsMeritfront
-	    VERSION = '3.1.29'
+	    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

@@ -477,7 +477,6 @@ module DynamicRecordsMeritfront
         # - multi_query allows more than one query (you can seperate an insert and an update with ';' I dont know how else to say it.)
         #		this disables other options (except name_modifiers). Not sure how it effects prepared statements. Its a fairly useless
         #		command as you can do multiple queries anyway with 'WITH' statements and also gain the other options.
-        # - async does what it says but I haven't used it yet so. Probabably doesn't work
         # - raw switches between using a Hash or a ActiveRecord::Response object when used on a abstract class
             args << {} unless args[-1].kind_of? Hash
             if args.length == 3
@@ -501,7 +500,6 @@ module DynamicRecordsMeritfront
             name_modifiers ||= []
             prepare = opts.delete(:prepare) != false
             multi_query = opts.delete(:multi_query) == true
-            async = opts.delete(:async) == true
             params = opts
 
                 #unique value hash cuts down on the number of repeated arguments like in an update or insert statement
@@ -557,7 +555,7 @@ module DynamicRecordsMeritfront
                         end
                     end
                     sql_vals = var_track.get_array_for_exec_query
-                    ret = ActiveRecord::Base.connection.exec_query sql, name, sql_vals, prepare: prepare, async: async
+                    ret = ActiveRecord::Base.connection.exec_query sql, name, sql_vals, prepare: prepare
                 else
                     ret = ActiveRecord::Base.connection.execute sql, name
                 end
@@ -567,14 +565,12 @@ module DynamicRecordsMeritfront
                 sql ||= ''
                 sql_vals ||= ''
                 prepare ||= ''
-                async ||= ''
                 Rails.logger.error(%Q{
     DynamicRecords#dynamic_sql debug info.
     name: #{name.to_s}
     sql: #{sql.to_s}
     sql_vals: #{sql_vals.to_s}
     prepare: #{prepare.to_s}
-    async: #{async.to_s}
     })
                 raise e
             end
@@ -599,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
@@ -619,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
@@ -637,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 = { })
@@ -651,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.29
+  version: 3.1.34
 platform: ruby
 authors:
 - Luke Clancy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashid-rails