Fixed test for session id changes

pkg/common/sql_types.go

@@ -71,14 +71,14 @@ func (n *SqlNull[T]) Scan(value any) error {
 	// Fallback: parse from string/bytes.
 	switch v := value.(type) {
 	case string:
-		return n.fromString(v)
+		return n.FromString(v)
 	case []byte:
-		return n.fromString(string(v))
+		return n.FromString(string(v))
 	default:
-		return n.fromString(fmt.Sprintf("%v", value))
+		return n.FromString(fmt.Sprintf("%v", value))
 	}
 }
-func (n *SqlNull[T]) fromString(s string) error {
+func (n *SqlNull[T]) FromString(s string) error {
 	s = strings.TrimSpace(s)
 	n.Valid = false
 	n.Val = *new(T)
@@ -156,7 +156,7 @@ func (n *SqlNull[T]) UnmarshalJSON(b []byte) error {
 	// Fallback: unmarshal as string and parse.
 	var s string
 	if err := json.Unmarshal(b, &s); err == nil {
-		return n.fromString(s)
+		return n.FromString(s)
 	}
 
 	return fmt.Errorf("cannot unmarshal %s into SqlNull[%T]", b, n.Val)
@@ -514,6 +514,30 @@ func Null[T any](v T, valid bool) SqlNull[T] {
 	return SqlNull[T]{Val: v, Valid: valid}
 }
 
+func NewSql[T any](value any) SqlNull[T] {
+	n := SqlNull[T]{}
+
+	if value == nil {
+		return n
+	}
+
+	// Fast path: exact match
+	if v, ok := value.(T); ok {
+		n.Val = v
+		n.Valid = true
+		return n
+	}
+
+	// Try from another SqlNull
+	if sn, ok := value.(SqlNull[T]); ok {
+		return sn
+	}
+
+	// Convert via string
+	_ = n.FromString(fmt.Sprintf("%v", value))
+	return n
+}
+
 func NewSqlInt16(v int16) SqlInt16 {
 	return SqlInt16{Val: v, Valid: true}
 }

pkg/funcspec/function_api_test.go

@@ -16,8 +16,8 @@ import (
 
 // MockDatabase implements common.Database interface for testing
 type MockDatabase struct {
-	QueryFunc          func(ctx context.Context, dest interface{}, query string, args ...interface{}) error
+	QueryFunc            func(ctx context.Context, dest interface{}, query string, args ...interface{}) error
-	ExecFunc           func(ctx context.Context, query string, args ...interface{}) (common.Result, error)
+	ExecFunc             func(ctx context.Context, query string, args ...interface{}) (common.Result, error)
 	RunInTransactionFunc func(ctx context.Context, fn func(common.Database) error) error
 }
 
@@ -161,9 +161,9 @@ func TestExtractInputVariables(t *testing.T) {
 	handler := NewHandler(&MockDatabase{})
 
 	tests := []struct {
-		name          string
+		name         string
-		sqlQuery      string
+		sqlQuery     string
-		expectedVars  []string
+		expectedVars []string
 	}{
 		{
 			name:         "No variables",
@@ -340,9 +340,9 @@ func TestSqlQryWhere(t *testing.T) {
 // TestGetIPAddress tests IP address extraction
 func TestGetIPAddress(t *testing.T) {
 	tests := []struct {
-		name      string
+		name     string
-		setupReq  func() *http.Request
+		setupReq func() *http.Request
-		expected  string
+		expected string
 	}{
 		{
 			name: "X-Forwarded-For header",
@@ -782,9 +782,10 @@ func TestReplaceMetaVariables(t *testing.T) {
 	handler := NewHandler(&MockDatabase{})
 
 	userCtx := &security.UserContext{
-		UserID:    123,
+		UserID:     123,
-		UserName:  "testuser",
+		UserName:   "testuser",
-		SessionID: "456",
+		SessionID:  "ABC456",
+		SessionRID: 456,
 	}
 
 	metainfo := map[string]interface{}{
@@ -821,6 +822,12 @@ func TestReplaceMetaVariables(t *testing.T) {
 			expectedCheck: func(result string) bool {
 				return strings.Contains(result, "456")
 			},
+		}, {
+			name:     "Replace [id_session]",
+			sqlQuery: "SELECT * FROM sessions WHERE session_id = [id_session]",
+			expectedCheck: func(result string) bool {
+				return strings.Contains(result, "ABC456")
+			},
 		},
 	}