scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-14 17:05:20 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1138 from okriuchykhin/ok_SCI_2404

Browse source 
Disable some validations in repository import to improve speed [SCI-2404]
This commit is contained in:
okriuchykhin 2018-05-16 10:17:10 +02:00 committed by GitHub
commit a7547b9775
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -83,7 +83,7 @@ GEM
activemodel (= 5.1.1) activemodel (= 5.1.1)
activesupport (= 5.1.1) activesupport (= 5.1.1)
arel (~> 8.0) arel (~> 8.0)
activerecord-import (0.22.0) activerecord-import (0.23.0)
activerecord (>= 3.2) activerecord (>= 3.2)
activesupport (5.1.1) activesupport (5.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)

5
app/models/repository_cell.rb
View file

@ -1,4 +1,6 @@
class RepositoryCell < ActiveRecord::Base class RepositoryCell < ActiveRecord::Base
attr_accessor :importing
belongs_to :repository_row belongs_to :repository_row
belongs_to :repository_column belongs_to :repository_column
belongs_to :value, polymorphic: true, belongs_to :value, polymorphic: true,
@ -28,7 +30,8 @@ class RepositoryCell < ActiveRecord::Base
validates :repository_column, presence: true validates :repository_column, presence: true
validate :repository_column_data_type validate :repository_column_data_type
validates :repository_row, validates :repository_row,
uniqueness: { scope: :repository_column } uniqueness: { scope: :repository_column },
unless: :importing
private private

1
app/utilities/repository_import_parser/importer.rb
View file

@ -94,6 +94,7 @@ module RepositoryImportParser
cell_value_resolver.column_list_items_size cell_value_resolver.column_list_items_size
end end
next if cell_value.nil? # checks the case if we reach items limit next if cell_value.nil? # checks the case if we reach items limit
cell_value.repository_cell.importing = true
unless cell_value.valid? unless cell_value.valid?
errors = true errors = true
raise ActiveRecord::Rollback raise ActiveRecord::Rollback