From 414336073e4a8b07024bdb655d184c0a9719f7ea Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 15 Sep 2022 13:26:06 +0200
Subject: [PATCH] Removing ignore-case feature from name attribute on settings

---
 store/adapters/rdbms/queries.gen.go |  2 +-
 store/adapters/rdbms/rdbms.gen.go   |  2 +-
 store/adapters/rdbms/upgrade.go     | 12 +++++++++---
 store/tests/settings_test.go        |  8 --------
 system/settings.cue                 |  1 -
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/store/adapters/rdbms/queries.gen.go b/store/adapters/rdbms/queries.gen.go
index 54c4cc9bc..a5a0f1622 100644
--- a/store/adapters/rdbms/queries.gen.go
+++ b/store/adapters/rdbms/queries.gen.go
@@ -4277,7 +4277,7 @@ var (
 	//
 	// This function is auto-generated
 	settingValueUpsertQuery = func(d goqu.DialectWrapper, res *systemType.SettingValue) *goqu.InsertDataset {
-		var target = `,rel_owner,LOWER(name)`
+		var target = `,rel_owner,name`
 
 		return settingValueInsertQuery(d, res).
 			OnConflict(
diff --git a/store/adapters/rdbms/rdbms.gen.go b/store/adapters/rdbms/rdbms.gen.go
index 76b53d5bc..90fdf11a8 100644
--- a/store/adapters/rdbms/rdbms.gen.go
+++ b/store/adapters/rdbms/rdbms.gen.go
@@ -17785,7 +17785,7 @@ func (s *Store) LookupSettingValueByNameOwnedBy(ctx context.Context, name string
 		rows   *sql.Rows
 		aux    = new(auxSettingValue)
 		lookup = settingValueSelectQuery(s.Dialect).Where(
-			s.Functions.LOWER(goqu.I("name")).Eq(strings.ToLower(name)),
+			goqu.I("name").Eq(name),
 			goqu.I("rel_owner").Eq(ownedBy),
 		).Limit(1)
 	)
diff --git a/store/adapters/rdbms/upgrade.go b/store/adapters/rdbms/upgrade.go
index e07fd493e..f9ed4031e 100644
--- a/store/adapters/rdbms/upgrade.go
+++ b/store/adapters/rdbms/upgrade.go
@@ -51,7 +51,8 @@ func createTablesFromModels(ctx context.Context, log *zap.Logger, dd ddl.DataDef
 				return fmt.Errorf("can not convert model %q to table: %w", m.Ident, err)
 			}
 
-			if _, err = dd.TableLookup(ctx, m.Ident); err != nil && errors.IsNotFound(err) {
+			_, err = dd.TableLookup(ctx, m.Ident)
+			if err != nil && errors.IsNotFound(err) {
 				err = dd.TableCreate(ctx, tbl)
 			}
 
@@ -65,8 +66,13 @@ func createTablesFromModels(ctx context.Context, log *zap.Logger, dd ddl.DataDef
 					continue
 				}
 
-				if err = dd.IndexCreate(ctx, tbl.Ident, idx); err != nil {
-					return fmt.Errorf("can not create index %q on table %q: %w", idx.Ident, tbl.Ident, err)
+				_, err = dd.IndexLookup(ctx, idx.Ident, idx.TableIdent)
+				if err != nil && !errors.IsNotFound(err) {
+					return
+				} else if errors.IsNotFound(err) {
+					if err = dd.IndexCreate(ctx, tbl.Ident, idx); err != nil {
+						return fmt.Errorf("can not create index %q on table %q: %w", idx.Ident, tbl.Ident, err)
+					}
 				}
 			}
 		}
diff --git a/store/tests/settings_test.go b/store/tests/settings_test.go
index b523cf7ef..aa4a0abf4 100644
--- a/store/tests/settings_test.go
+++ b/store/tests/settings_test.go
@@ -103,14 +103,6 @@ func testSettingValues(t *testing.T, s store.SettingValues) {
 			req.NoError(err)
 			req.Len(set, 0)
 		})
-
-		t.Run("by name and ownedBy", func(t *testing.T) {
-			req, setting := truncAndCreate(t)
-			req.NoError(s.DeleteSettingValueByNameOwnedBy(ctx, setting.Name, setting.OwnedBy))
-			set, _, err := s.SearchSettingValues(ctx, types.SettingsFilter{OwnedBy: setting.OwnedBy})
-			req.NoError(err)
-			req.Len(set, 0)
-		})
 	})
 
 	t.Run("search", func(t *testing.T) {
diff --git a/system/settings.cue b/system/settings.cue
index d66777dd1..ef80bd144 100644
--- a/system/settings.cue
+++ b/system/settings.cue
@@ -24,7 +24,6 @@ settings: {
 				dal: { type: "Ref", refModelResType: "corteza::system:user" }
 			}
 			name:        {
-				ignoreCase: true
 				dal: { type: "Text", length: 512 }
 			}
 			value:       {