Refactor parsing & select order by impl (#6)

Reviewed-on: #6

exec/exec.go

@@ -157,100 +157,6 @@ type Exec[T any] interface {
 	execute(conn *simpleorm.DBConnection, tx *sql.Tx) error
 }
 
-type Select[T any] struct {
-	target    schema.Table
-	whereStmt string
-	args      []any
-	results   []T
-	Limit     int64
-	Offset    int64
-}
-
-func CreateSelect[T any](orm *simpleorm.ORM, whereStmt string, args ...any) (Select[T], error) {
-	table, ok := orm.Cache().Get(reflect.TypeFor[T]().Name())
-	if !ok {
-		return Select[T]{}, errors.New("Failed to get table from schema cache")
-	}
-
-	return Select[T]{target: *table, whereStmt: whereStmt, args: args, Limit: -1, Offset: -1}, nil
-}
-
-func (s *Select[T]) Results() []T {
-	return s.results
-}
-
-func (s *Select[T]) Execute(conn *simpleorm.DBConnection) error {
-	return s.execute(conn, nil)
-}
-
-func (s *Select[T]) execute(conn *simpleorm.DBConnection, tx *sql.Tx) error {
-	// Reinit the results, new execution
-	s.results = []T{}
-	dml, err := s.target.GetSelectDML()
-	if err != nil {
-		return err
-	}
-
-	if s.whereStmt != "" {
-		dml += " WHERE " + s.whereStmt
-	}
-
-	var effectiveArgs []any = s.args
-	if s.Limit != -1 {
-		dml += " LIMIT ?"
-		effectiveArgs = append(effectiveArgs, s.Limit)
-	}
-
-	if s.Offset != -1 {
-		dml += " OFFSET ?"
-		effectiveArgs = append(effectiveArgs, s.Offset)
-	}
-
-	log.LogDebug("Preparing sql: %s, with args: %s", dml, effectiveArgs)
-
-	var stmt *sql.Stmt
-	if tx != nil {
-		stmt, err = tx.Prepare(dml)
-	} else {
-		stmt, err = conn.Prepare(dml)
-	}
-
-	if err != nil {
-		return err
-	}
-	defer stmt.Close()
-
-	log.LogDebug("Executing statement: %s", stmt)
-
-	var rows *sql.Rows
-	if len(effectiveArgs) == 0 {
-		rows, err = stmt.Query()
-	} else {
-		// Flattent args to make sure it can be parsed correctly
-		var flatArgs []any
-		for _, a := range effectiveArgs {
-			if s, ok := a.([]any); ok {
-				flatArgs = append(flatArgs, s...)
-			} else {
-				flatArgs = append(flatArgs, a)
-			}
-		}
-		rows, err = stmt.Query(flatArgs...)
-
-	}
-
-	if err != nil {
-		return err
-	}
-
-	s.results, err = readRows[T](s.target, rows)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 type Count[T any] struct {
 	target    schema.Table
 	whereStmt string
@@ -514,9 +420,10 @@ func (d *Delete[T]) execute(conn *simpleorm.DBConnection, tx *sql.Tx) error {
 }
 
 func createSelectResultContainer(t schema.Table) []any {
-	vals := make([]any, t.Type.NumField())
+	typ := t.Type()
+	vals := make([]any, typ.NumField())
 	for i := range vals {
-		switch t.Type.Field(i).Type.Kind().String() {
+		switch typ.Field(i).Type.Kind().String() {
 		case "string":
 			var fieldContainer string
 			vals[i] = &fieldContainer
@@ -532,13 +439,14 @@ func createSelectResultContainer(t schema.Table) []any {
 }
 
 func prepareParams(src any, t schema.Table) []any {
+	typ := t.Type()
 	var params []any
-	for _, col := range t.Columns {
+	for _, col := range t.Columns() {
 		_, ok := col.Modifiers["pk"]
 		if ok && t.IsPkAuto() {
 			continue
 		}
-		field, ok := t.Type.FieldByName(col.FieldName)
+		field, ok := typ.FieldByName(col.FieldName)
 		if !ok {
 			continue
 		}
@@ -550,11 +458,12 @@ func prepareParams(src any, t schema.Table) []any {
 }
 
 func getPk(src any, t schema.Table) ([]any, error) {
+	typ := t.Type()
 	var values []any
-	for _, constraint := range t.Constraints {
+	for _, constraint := range t.Constraints() {
 		if constraint.Type == "pk" {
 			for _, col := range constraint.Columns {
-				field, ok := t.Type.FieldByName(col.FieldName)
+				field, ok := typ.FieldByName(col.FieldName)
 				if !ok {
 					continue
 
@@ -582,10 +491,11 @@ func readRows[T any](table schema.Table, rows *sql.Rows) ([]T, error) {
 			return nil, err
 		}
 
-		targetType := table.Type
+		targetType := table.Type()
+		cols := table.Columns()
 		parsedResult := reflect.New(targetType)
 		for i, fieldVal := range rowContainer {
-			col := table.Columns[i]
+			col := cols[i]
 			targetField := parsedResult.Elem().Field(i)
 
 			rawValue := reflect.Indirect(reflect.ValueOf(fieldVal))