Removing ignore-case feature from name attribute on settings

This commit is contained in:
Denis Arh
2022-09-15 13:26:06 +02:00
parent 8803490f42
commit 414336073e
5 changed files with 11 additions and 14 deletions
+1 -1
View File
@@ -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(
+1 -1
View File
@@ -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)
)
+9 -3
View File
@@ -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)
}
}
}
}
-8
View File
@@ -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) {
-1
View File
@@ -24,7 +24,6 @@ settings: {
dal: { type: "Ref", refModelResType: "corteza::system:user" }
}
name: {
ignoreCase: true
dal: { type: "Text", length: 512 }
}
value: {