From 336315aee6ce4042e9372a95b6dcc9b8720a9038 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 15 Sep 2022 13:07:08 +0200
Subject: [PATCH] Fix model-creation error handling

---
 store/adapters/rdbms/dal/connection.go | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/store/adapters/rdbms/dal/connection.go b/store/adapters/rdbms/dal/connection.go
index 02c7d7aa3..0f8f297e8 100644
--- a/store/adapters/rdbms/dal/connection.go
+++ b/store/adapters/rdbms/dal/connection.go
@@ -127,11 +127,11 @@ func (c *connection) CreateModel(ctx context.Context, mm ...*dal.Model) (err err
 	defer c.mux.Unlock()
 	for _, m := range mm {
 		err = ddl.UpdateModel(ctx, c.dataDefiner, m)
-		if !errors.IsNotFound(err) && err != nil {
-			return
-		}
-
-		if err = ddl.CreateModel(ctx, c.dataDefiner, m); err != nil {
+		if errors.IsNotFound(err) {
+			if err = ddl.CreateModel(ctx, c.dataDefiner, m); err != nil {
+				return
+			}
+		} else if err != nil {
 			return
 		}