db_memoize 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520170b67792fdb3910895e3c510d6085cbd8666a306d357fdbd61236981c958
-  data.tar.gz: 921d0f58c8757bfc145132e95495f444d8d10cabc3fef247ae945faecc84e883
+  metadata.gz: eccd7dee2a2a8e43545c7adfc0fcf471a5cd59d2a06b02dfdd8e6adea8f6352e
+  data.tar.gz: 4683ab98fab4e440b3e61124d9c1ae30fcb87b7d939814f874702cc23f020602
 SHA512:
-  metadata.gz: 356ede40ddf8a75be14043d01fa83fad462c6df3adc0c28db8a18a866276fdbd7b51c9ad8aef7e6236215f6f623fdbdde5575f987bb46807ddbe425e81e1a12e
-  data.tar.gz: 4c386fbe295073209a55ebac0ff4e03ac97037810fa7b42d7690ce7c4d05f92727887f00e7a9f2045e865b157ad7026607a6899d305d57381437f583c9304e3e
+  metadata.gz: 374ff41e01ec60b1e3e51f2e99969aa13199b512e364bf376462b79fdbf79e0fc07b25988da1f9619f0f6b1e588cea3934c92cf2036367ac49a29f8c52ec510b
+  data.tar.gz: f32dd2bc3cf5d8f66e6f4566dd8be90a6cd0b1c6c2cf1d45fd5fef4566ef63fa3e1f23fd9e551c5f820f7b01ee9bd97990c4b844ceb6e4c56ee8f675f3a80a29

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/db_memoize/value.rb

@@ -44,6 +44,16 @@ module DbMemoize
       SQL
     end
 
+    ALL_COLUMNS = [
+      :val_string,
+      :val_integer,
+      :val_float,
+      :val_time,
+      :val_object,
+      :val_boolean,
+      :val_nil
+    ].freeze
+
     def self.fast_create(entity_table_name, entity_id, method_name, value)
       method_name = method_name.to_s
 
@@ -66,38 +76,17 @@ module DbMemoize
                  raise "Unsupported value of type #{value.class.name}: #{value.inspect}"
                end
 
-      value = JSON.generate(value) if column == :val_object
-
-      # it looks like Simple::SQL somehow drops subsecond resolutions from
-      # time objects. AR does not, though. So, for time values, we use the
-      # ActiveRecord method; for everything else we use Simple::SQL (for
-      # performance reasons: it is 10 times as fast.)
-      if column != :val_time
-        simple_sql_create_value column, entity_table_name: entity_table_name, entity_id: entity_id,
-                                        method_name: method_name, value: value
-      else
-        ar_create_value column, entity_table_name: entity_table_name, entity_id: entity_id,
-                                method_name: method_name, value: value
+      # some types need special encoding
+      case column
+      when :val_object  then value = _reformat_object(value)
+      when :val_time    then value = _reformat_time(value)
       end
-    end
 
-    ALL_COLUMNS = [
-      :val_string,
-      :val_integer,
-      :val_float,
-      :val_time,
-      :val_object,
-      :val_boolean,
-      :val_nil
-    ].freeze
-
-    def self.simple_sql_create_value(column, entity_table_name:, entity_id:, method_name:, value:)
       other_columns = ALL_COLUMNS - [column]
       default_updates = other_columns.map { |c| "#{c}=NULL" }
 
       sql = <<~SQL.freeze
-        INSERT INTO #{table_name}
-          (entity_table_name, entity_id, method_name, #{column}, created_at)
+        INSERT INTO #{table_name}(entity_table_name, entity_id, method_name, #{column}, created_at)
           VALUES($1,$2,$3,$4,NOW())
           ON CONFLICT (entity_id, entity_table_name, method_name)
           DO UPDATE
@@ -107,16 +96,20 @@ module DbMemoize
       SQL.ask sql, entity_table_name, entity_id, method_name, value
     end
 
-    def self.ar_create_value(column, entity_table_name:, entity_id:, method_name:, value:)
-      # [TODO] this code is not resolving conflicts on the unique index.
-      data = {
-        :entity_table_name => entity_table_name,
-        :entity_id => entity_id,
-        :method_name => method_name,
-        column => value
-      }
+    # Apparently the pg, and for that matter also simple-sql, drops subsecond
+    # resolution when passing in time objects. (Note that this seems not always
+    # to be the case, it probably depends on some encoder configuration within
+    # pg - which simple-sql is not touching, since this is a setting on a
+    # connection which might not be exclusive to simple-sql.)
+    #
+    # Instead we'll just pass along a string, postgresql will then convert it
+    # into a proper timestamp.
+    def self._reformat_time(t) # rubocop:disable Naming/UncommunicativeMethodParamName
+      format('%04d%02d-%02d %02d:%02d:%02d.%06d', t.year, t.mon, t.day, t.hour, t.min, t.sec, t.usec)
+    end
 
-      create!(data)
+    def self._reformat_object(value)
+      JSON.generate(value)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_memoize
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - johannes-kostas goetzinger