From 97fd780edfce49238280a8b71a1315b589817e77 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Mon, 14 Nov 2022 07:40:57 +0100
Subject: [PATCH] Refactor rdbms-dal code and unify store-ident logic

---
 store/adapters/rdbms/dal/model.go       |  3 ---
 store/adapters/rdbms/drivers/columns.go |  2 +-
 store/adapters/rdbms/drivers/table.go   | 15 +--------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/store/adapters/rdbms/dal/model.go b/store/adapters/rdbms/dal/model.go
index f2260764a..eae279cfe 100644
--- a/store/adapters/rdbms/dal/model.go
+++ b/store/adapters/rdbms/dal/model.go
@@ -314,9 +314,6 @@ func (d *model) Aggregate(f filter.Filter, groupBy []dal.AggregateAttr, aggrExpr
 		return
 	}
 
-	i.src = Model(srcModel, d.conn, d.dialect)
-	i.dst = Model(dstModel, d.conn, d.dialect)
-
 	return
 }
 
diff --git a/store/adapters/rdbms/drivers/columns.go b/store/adapters/rdbms/drivers/columns.go
index bfd28d93d..f435d8268 100644
--- a/store/adapters/rdbms/drivers/columns.go
+++ b/store/adapters/rdbms/drivers/columns.go
@@ -36,7 +36,7 @@ func NewSingleValueColumn(d Dialect, a *dal.Attribute) *SingleValueColumn {
 	return &SingleValueColumn{
 		typ:  d.TypeWrap(a.Type),
 		attr: a,
-		name: attrColumnIdent(a),
+		name: a.StoreIdent(),
 	}
 }
 
diff --git a/store/adapters/rdbms/drivers/table.go b/store/adapters/rdbms/drivers/table.go
index bbca59408..331c6afcc 100644
--- a/store/adapters/rdbms/drivers/table.go
+++ b/store/adapters/rdbms/drivers/table.go
@@ -52,7 +52,7 @@ func NewTableCodec(m *dal.Model, d Dialect) *GenericTableCodec {
 
 	for a := range m.Attributes {
 		attr = m.Attributes[a]
-		colIdent = attrColumnIdent(attr)
+		colIdent = attr.StoreIdent()
 
 		if done[colIdent] {
 			continue
@@ -148,19 +148,6 @@ func (t *GenericTableCodec) AttributeExpression(ident string) (exp.Expression, e
 	return exp.NewLiteralExpression("?", exp.NewIdentifierExpression("", t.model.Ident, ident)), nil
 }
 
-func attrColumnIdent(att *dal.Attribute) string {
-	switch ss := att.Store.(type) {
-	case *dal.CodecRecordValueSetJSON:
-		return ss.Ident
-
-	case *dal.CodecAlias:
-		return ss.Ident
-
-	default:
-		return att.Ident
-	}
-}
-
 func collectStdRecordValueJSONColumns(ident string, aa ...*dal.Attribute) []*dal.Attribute {
 	filtered := make([]*dal.Attribute, 0)
 	for _, a := range aa {