care 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6d03b8aa20a846551e3e1319fa161a703b179c94f00137195393509ee266612
-  data.tar.gz: 41a319cc5cf7648f99b7448d532adfebb030017503d975524005357cfcf3960d
+  metadata.gz: e0d173cca687ef272ba0759ff347995723a34052af354aa01a22fac55614bbd9
+  data.tar.gz: f4975d1110fe9eed49cb1e1964a716be88d78fb012faba92472576371bfa7658
 SHA512:
-  metadata.gz: 489aefd3f93e031cfeec9ae6ffa748f94a2d69cd3ffa50b9a1f730a05119b6d1d09eb60ddc66818a53e560aeca9d351b948848a9c33206d66c2de9f9c0c72882
-  data.tar.gz: 9b343fb18f63030afede812e4d78e14fd612e8c18fefb89f1ea15212c92f7409c0495f11d39b73503176c7ad75e137a181c4dc26d20e6897f1fad1cef25344ee
+  metadata.gz: db5fac70a2cf214bf2294077411da7924f6c25c6dd3b458d48eab4338cbbe4cf2a20fe5e37f69e55c9c9992fa28e3e319d7b2c33fdfccf3827bf99a78909a244
+  data.tar.gz: c8f3cd3169d948c88a1ec55fefc14fab39c74eed92e564e46e51e62dfcef832b72b7819d0da03888f7915592da59dda0c7ba1ea147553307c34d88de9e78eff5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    care (0.1.5)
+    care (0.1.6)
       active_model_serializers (~> 0.10.10)
       activerecord-import
       cancancan

data/lib/care/seed.rb

@@ -5,13 +5,15 @@ module Care
         table_name = path.split("/").last.gsub(".json", "").gsub(/^\d*_/, "")
         puts "*** Преднаполнение таблицы #{table_name} ***"
         items = ActiveSupport::JSON.decode(File.read(path))
-        begin
-          items_class = table_name.classify.constantize
+        table_name = table_name.gsub('dictionary_', 'dictionary/') || table_name
+        if (items_class = table_name.classify.safe_constantize)
           items_class.import(items, on_duplicate_key_update: :all)
-        rescue NameError => _e # Не обнаружен класс с описанием модели
-          keys = items[0].keys.join(",")
+        else
+          keys = items[0].keys
+          v_keys = keys.join(",")
           values = items.map { |i| "(#{i.values.map { |v| "'#{v}'" }.join(",")})" }.join(",")
-          sql = "insert into #{table_name}(#{keys}) values #{values} on conflict (id) do nothing"
+          set_keys = keys.map{|k| "#{k} = excluded.#{k}"}.join(", ")
+          sql = "insert into #{table_name}(#{v_keys}) values #{values} on conflict (id) do update set #{set_keys}"
           puts sql
           ActiveRecord::Base.connection.execute sql
         end

data/lib/care/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Care
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: care
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Валерий Маханов
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -314,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Care