From 1a522725a204a1c580999caf765ee5e566dead5f Mon Sep 17 00:00:00 2001 From: ko_oler <kooler89@gmail.com> Date: Fri, 21 Jul 2023 09:52:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/setup/collection.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkg/setup/collection.go b/pkg/setup/collection.go index b5dec74a..cfd6e3f7 100644 --- a/pkg/setup/collection.go +++ b/pkg/setup/collection.go @@ -76,14 +76,6 @@ func DeleteCollectionIfRemove() CollectionsOption { } func isCollsSchemaMetadataEqual(collection, exist *collections.Collection) bool { - if alwaysSetSchema { - return true - } - - if collection.IsView() && exist.IsView() { - return true - } - if collection.Schema.Metadata == nil && exist.Schema.Metadata == nil { return true } @@ -100,7 +92,7 @@ func isCollsSchemaMetadataEqual(collection, exist *collections.Collection) bool func DefaultUpdateCollectionStrategy() CollectionsOption { return func(c *CollectionConfig) { c.UpdateFn = func(s *Setup, exist, collection *collections.Collection) (*collections.Collection, bool, bool, error) { - if !s.IsForce() && !isCollsSchemaMetadataEqual(collection, exist) { + if !alwaysSetSchema && !s.IsForce() && !collection.IsView() && !exist.IsView() && !isCollsSchemaMetadataEqual(collection, exist) { return nil, false, false, errors.WithDetailf(collections.ErrAlreadyExists, "Коллекция с идентификатором '%s' "+ "уже существует. Удалите ее или вызовите установку расширения с флагом Force", collection.ID) } -- GitLab