mirror of
https://github.com/bitechdev/ResolveSpec.git
synced 2026-05-15 16:25:20 +00:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cb921f2c5e | ||
|
|
1ebe0d7ac3 | ||
|
|
ae9e06c98b | ||
|
|
2ae4d07544 | ||
|
|
49639b6c19 | ||
|
|
8733176cba | ||
|
|
bce27f7ed2 | ||
|
|
987a2a7faf | ||
| 157788b73b | |||
|
|
fb051b5577 | ||
|
|
cc9c4337fd | ||
|
|
0aaeff63a2 |
@@ -487,6 +487,14 @@ func normalizeTableAlias(query, expectedAlias, tableName string) string {
|
||||
return modified
|
||||
}
|
||||
|
||||
func isJoinKeyword(word string) bool {
|
||||
switch strings.ToUpper(word) {
|
||||
case "JOIN", "INNER", "LEFT", "RIGHT", "FULL", "OUTER", "CROSS":
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func (b *BunSelectQuery) WhereOr(query string, args ...interface{}) common.SelectQuery {
|
||||
b.query = b.query.WhereOr(query, args...)
|
||||
return b
|
||||
@@ -517,7 +525,7 @@ func (b *BunSelectQuery) Join(query string, args ...interface{}) common.SelectQu
|
||||
if prefix != "" && !strings.Contains(strings.ToUpper(query), " AS ") {
|
||||
// If query doesn't already have AS, check if it's a simple table name
|
||||
parts := strings.Fields(query)
|
||||
if len(parts) > 0 && !strings.HasPrefix(strings.ToUpper(parts[0]), "JOIN") {
|
||||
if len(parts) > 0 && !isJoinKeyword(parts[0]) {
|
||||
// Simple table name, add prefix: "table AS prefix"
|
||||
joinClause = fmt.Sprintf("%s AS %s", parts[0], prefix)
|
||||
if len(parts) > 1 {
|
||||
@@ -552,7 +560,7 @@ func (b *BunSelectQuery) LeftJoin(query string, args ...interface{}) common.Sele
|
||||
joinClause := query
|
||||
if prefix != "" && !strings.Contains(strings.ToUpper(query), " AS ") {
|
||||
parts := strings.Fields(query)
|
||||
if len(parts) > 0 && !strings.HasPrefix(strings.ToUpper(parts[0]), "LEFT") && !strings.HasPrefix(strings.ToUpper(parts[0]), "JOIN") {
|
||||
if len(parts) > 0 && !isJoinKeyword(parts[0]) {
|
||||
joinClause = fmt.Sprintf("%s AS %s", parts[0], prefix)
|
||||
if len(parts) > 1 {
|
||||
joinClause += " " + strings.Join(parts[1:], " ")
|
||||
@@ -597,6 +605,19 @@ func (b *BunSelectQuery) PreloadRelation(relation string, apply ...func(common.S
|
||||
if !b.skipAutoDetect {
|
||||
model := b.query.GetModel()
|
||||
if model != nil && model.Value() != nil {
|
||||
// Guard against relations that don't exist on the model. Without this,
|
||||
// bun panics inside Count/Scan with `model=X does not have relation="Y"`.
|
||||
// Only validate the root segment so nested paths (e.g. "PRM.CHILD") still
|
||||
// fall through to bun's native resolution.
|
||||
rootRelation := relation
|
||||
if idx := strings.Index(rootRelation, "."); idx >= 0 {
|
||||
rootRelation = rootRelation[:idx]
|
||||
}
|
||||
if reflection.GetRelationType(model.Value(), rootRelation) == reflection.RelationUnknown {
|
||||
logger.Warn("Skipping preload '%s': relation '%s' is not declared on model %T", relation, rootRelation, model.Value())
|
||||
return b
|
||||
}
|
||||
|
||||
relType := reflection.GetRelationType(model.Value(), relation)
|
||||
|
||||
// Log the detected relationship type
|
||||
@@ -1516,7 +1537,7 @@ func (b *BunUpdateQuery) SetMap(values map[string]interface{}) common.UpdateQuer
|
||||
// Skip primary key updates
|
||||
continue
|
||||
}
|
||||
b.query = b.query.Set(column+" = ?", value)
|
||||
b.query = b.query.Set(column+" = ?", common.ConvertSliceForBun(value))
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package common
|
||||
import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/bitechdev/ResolveSpec/pkg/logger"
|
||||
@@ -261,3 +262,48 @@ func GetTableNameFromModel(model interface{}) string {
|
||||
// This handles cases like "MasterTaskItem" -> "mastertaskitem"
|
||||
return strings.ToLower(modelType.Name())
|
||||
}
|
||||
|
||||
// ConvertSliceForBun converts []interface{} values to PostgreSQL array literal strings.
|
||||
// BUN's fallback appender for []interface{} is JSON encoding, which produces "[]" —
|
||||
// invalid PostgreSQL array syntax. PostgreSQL expects "{}" for empty arrays and
|
||||
// "{elem1,elem2}" for non-empty ones. All other value types are returned unchanged.
|
||||
func ConvertSliceForBun(value interface{}) interface{} {
|
||||
arr, ok := value.([]interface{})
|
||||
if !ok {
|
||||
return value
|
||||
}
|
||||
if len(arr) == 0 {
|
||||
return "{}"
|
||||
}
|
||||
parts := make([]string, len(arr))
|
||||
for i, elem := range arr {
|
||||
switch e := elem.(type) {
|
||||
case string:
|
||||
needsQuote := e == "" || strings.ContainsAny(e, `,"\\{}`+"\t\n\r ")
|
||||
if needsQuote {
|
||||
e = strings.ReplaceAll(e, `\`, `\\`)
|
||||
e = strings.ReplaceAll(e, `"`, `""`)
|
||||
parts[i] = `"` + e + `"`
|
||||
} else {
|
||||
parts[i] = e
|
||||
}
|
||||
case float64:
|
||||
if e == float64(int64(e)) {
|
||||
parts[i] = strconv.FormatInt(int64(e), 10)
|
||||
} else {
|
||||
parts[i] = strconv.FormatFloat(e, 'f', -1, 64)
|
||||
}
|
||||
case bool:
|
||||
if e {
|
||||
parts[i] = "t"
|
||||
} else {
|
||||
parts[i] = "f"
|
||||
}
|
||||
case nil:
|
||||
parts[i] = "NULL"
|
||||
default:
|
||||
parts[i] = fmt.Sprintf("%v", e)
|
||||
}
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}"
|
||||
}
|
||||
|
||||
@@ -106,3 +106,66 @@ func TestExtractTagValue(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestConvertSliceForBun(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input interface{}
|
||||
expected interface{}
|
||||
}{
|
||||
{
|
||||
name: "empty slice produces empty pg array",
|
||||
input: []interface{}{},
|
||||
expected: "{}",
|
||||
},
|
||||
{
|
||||
name: "string elements",
|
||||
input: []interface{}{"a", "b", "c"},
|
||||
expected: "{a,b,c}",
|
||||
},
|
||||
{
|
||||
name: "string element needing quotes",
|
||||
input: []interface{}{"hello world", "ok"},
|
||||
expected: `{"hello world",ok}`,
|
||||
},
|
||||
{
|
||||
name: "string with comma",
|
||||
input: []interface{}{"a,b"},
|
||||
expected: `{"a,b"}`,
|
||||
},
|
||||
{
|
||||
name: "integer elements (JSON float64)",
|
||||
input: []interface{}{float64(1), float64(2), float64(3)},
|
||||
expected: "{1,2,3}",
|
||||
},
|
||||
{
|
||||
name: "bool elements",
|
||||
input: []interface{}{true, false},
|
||||
expected: "{t,f}",
|
||||
},
|
||||
{
|
||||
name: "nil input passthrough",
|
||||
input: nil,
|
||||
expected: nil,
|
||||
},
|
||||
{
|
||||
name: "string input passthrough",
|
||||
input: "hello",
|
||||
expected: "hello",
|
||||
},
|
||||
{
|
||||
name: "int input passthrough",
|
||||
input: 42,
|
||||
expected: 42,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := ConvertSliceForBun(tt.input)
|
||||
if result != tt.expected {
|
||||
t.Errorf("ConvertSliceForBun(%v) = %v; want %v", tt.input, result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ func (p *NestedCUDProcessor) processInsert(
|
||||
query := p.db.NewInsert().Table(tableName)
|
||||
|
||||
for key, value := range data {
|
||||
query = query.Value(key, value)
|
||||
query = query.Value(key, ConvertSliceForBun(value))
|
||||
}
|
||||
pkName := reflection.GetPrimaryKeyName(tableName)
|
||||
// Add RETURNING clause to get the inserted ID
|
||||
|
||||
@@ -59,6 +59,38 @@ func IsSQLExpression(cond string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// reEmptyCompMid matches a simple column comparison with an empty RHS that is immediately
|
||||
// followed by AND/OR (only whitespace between the operator and the next keyword).
|
||||
// Removing the match leaves the preceding AND/OR connector intact.
|
||||
// Example: "cond1 and col = \n and cond2" → "cond1 and cond2"
|
||||
var reEmptyCompMid = regexp.MustCompile(`(?i)[\w.]+\s*(?:=|<>|!=|>=|<=|>|<)\s+(?:and|or)\s+`)
|
||||
|
||||
// reEmptyCompEnd matches AND/OR + a simple column comparison with an empty RHS at the end
|
||||
// of the string (or sub-clause).
|
||||
// Example: "cond1 and col = " → "cond1"
|
||||
var reEmptyCompEnd = regexp.MustCompile(`(?i)\s+(?:and|or)\s+[\w.]+\s*(?:=|<>|!=|>=|<=|>|<)\s*$`)
|
||||
|
||||
// stripEmptyComparisonClauses removes comparison conditions that have no right-hand side
|
||||
// value from a raw SQL string. Operates on the whole string so it also cleans up conditions
|
||||
// inside subqueries, not just top-level AND splits.
|
||||
func stripEmptyComparisonClauses(sql string) string {
|
||||
sql = reEmptyCompMid.ReplaceAllLiteralString(sql, "")
|
||||
sql = reEmptyCompEnd.ReplaceAllLiteralString(sql, "")
|
||||
return sql
|
||||
}
|
||||
|
||||
// hasEmptyRHS returns true when a condition ends with a comparison operator and has no
|
||||
// right-hand side value — e.g., "col = ", "com.rid_parent = ", "col >= ".
|
||||
func hasEmptyRHS(cond string) bool {
|
||||
cond = strings.TrimSpace(cond)
|
||||
for _, op := range []string{"<>", "!=", ">=", "<=", "=", ">", "<"} {
|
||||
if strings.HasSuffix(cond, op) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// IsTrivialCondition checks if a condition is trivial and always evaluates to true
|
||||
// These conditions should be removed from WHERE clauses as they have no filtering effect
|
||||
func IsTrivialCondition(cond string) bool {
|
||||
@@ -147,6 +179,14 @@ func SanitizeWhereClause(where string, tableName string, options ...*RequestOpti
|
||||
return ""
|
||||
}
|
||||
|
||||
// Strip comparison conditions with empty RHS throughout the SQL string (including
|
||||
// inside subqueries), before condition splitting.
|
||||
where = stripEmptyComparisonClauses(where)
|
||||
if where == "" {
|
||||
return ""
|
||||
}
|
||||
where = strings.TrimSpace(where)
|
||||
|
||||
// Check if the original clause has outer parentheses and contains OR operators
|
||||
// If so, we need to preserve the outer parentheses to prevent OR logic from escaping
|
||||
hasOuterParens := false
|
||||
@@ -212,6 +252,12 @@ func SanitizeWhereClause(where string, tableName string, options ...*RequestOpti
|
||||
continue
|
||||
}
|
||||
|
||||
// Skip conditions with no right-hand side value (e.g. "col = " with empty value)
|
||||
if hasEmptyRHS(condToCheck) {
|
||||
logger.Debug("Removing condition with empty value: '%s'", cond)
|
||||
continue
|
||||
}
|
||||
|
||||
// If tableName is provided and the condition HAS a table prefix, check if it's correct
|
||||
if tableName != "" && hasTablePrefix(condToCheck) {
|
||||
// Extract the current prefix and column name
|
||||
|
||||
@@ -134,6 +134,30 @@ func TestSanitizeWhereClause(t *testing.T) {
|
||||
tableName: "apiprovider",
|
||||
expected: "apiprovider.type in ('softphone') AND (apiprovider.rid_apiprovider in (select l.rid_apiprovider from core.apiproviderlink l where l.rid_hub = 2576))",
|
||||
},
|
||||
{
|
||||
name: "empty RHS stripped mid-clause",
|
||||
where: "com.tableprefix = 'tcli' and com.rid_parent = \n and com.status = 'Active'",
|
||||
tableName: "",
|
||||
expected: "com.tableprefix = 'tcli' AND com.status = 'Active'",
|
||||
},
|
||||
{
|
||||
name: "empty RHS stripped at end of clause",
|
||||
where: "com.tableprefix = 'tcli' and com.rid_parent =",
|
||||
tableName: "",
|
||||
expected: "com.tableprefix = 'tcli'",
|
||||
},
|
||||
{
|
||||
name: "non-empty value not stripped",
|
||||
where: "com.tableprefix = 'tcli' and com.rid_parent = 123 and com.status = 'Active'",
|
||||
tableName: "",
|
||||
expected: "com.tableprefix = 'tcli' AND com.rid_parent = 123 AND com.status = 'Active'",
|
||||
},
|
||||
{
|
||||
name: "empty RHS inside subquery stripped",
|
||||
where: "a = 1 and b in (select x from t where c.rid = \n and d = 2)",
|
||||
tableName: "",
|
||||
expected: "a = 1 AND b in (select x from t where d = 2)",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
|
||||
@@ -168,9 +168,16 @@ func (h *Handler) SqlQueryList(sqlquery string, options SqlQueryOptions) HTTPFun
|
||||
// Replace meta variables in SQL
|
||||
sqlquery = h.replaceMetaVariables(sqlquery, r, userCtx, metainfo, variables)
|
||||
|
||||
// Remove unused input variables
|
||||
if options.BlankParams {
|
||||
for _, kw := range inputvars {
|
||||
// Replace variables from provided values, then blank any remaining unused ones
|
||||
for _, kw := range inputvars {
|
||||
varName := kw[1 : len(kw)-1] // strip [ and ]
|
||||
if val, ok := variables[varName]; ok {
|
||||
if strVal := fmt.Sprintf("%v", val); strVal != "" {
|
||||
sqlquery = strings.ReplaceAll(sqlquery, kw, ValidSQL(strVal, "colvalue"))
|
||||
continue
|
||||
}
|
||||
}
|
||||
if options.BlankParams {
|
||||
replacement := getReplacementForBlankParam(sqlquery, kw)
|
||||
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
||||
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
||||
@@ -520,9 +527,16 @@ func (h *Handler) SqlQuery(sqlquery string, options SqlQueryOptions) HTTPFuncTyp
|
||||
}
|
||||
}
|
||||
|
||||
// Remove unused input variables
|
||||
if options.BlankParams {
|
||||
for _, kw := range inputvars {
|
||||
// Replace variables from provided values, then blank any remaining unused ones
|
||||
for _, kw := range inputvars {
|
||||
varName := kw[1 : len(kw)-1] // strip [ and ]
|
||||
if val, ok := variables[varName]; ok {
|
||||
if strVal := fmt.Sprintf("%v", val); strVal != "" {
|
||||
sqlquery = strings.ReplaceAll(sqlquery, kw, ValidSQL(strVal, "colvalue"))
|
||||
continue
|
||||
}
|
||||
}
|
||||
if options.BlankParams {
|
||||
replacement := getReplacementForBlankParam(sqlquery, kw)
|
||||
sqlquery = strings.ReplaceAll(sqlquery, kw, replacement)
|
||||
logger.Debug("Replaced unused variable %s with: %s", kw, replacement)
|
||||
@@ -715,8 +729,10 @@ func (h *Handler) mergeQueryParams(r *http.Request, sqlquery string, variables m
|
||||
propQry[parmk] = val
|
||||
}
|
||||
|
||||
// Apply filters if allowed
|
||||
if allowFilter && len(parmk) > 1 && strings.Contains(strings.ToLower(sqlquery), strings.ToLower(parmk)) {
|
||||
// Apply filters if allowed — check only the SELECT list to avoid matching function
|
||||
// parameters in the FROM clause (e.g. [p_rid_doctype] in a set-returning function call)
|
||||
// or names inside quoted string arguments.
|
||||
if allowFilter && len(parmk) > 1 && strings.Contains(sqlSelectList(sqlStripStringLiterals(sqlquery)), strings.ToLower(parmk)) {
|
||||
if len(parmv) > 1 {
|
||||
// Sanitize each value in the IN clause with appropriate quoting
|
||||
sanitizedValues := make([]string, len(parmv))
|
||||
@@ -824,6 +840,26 @@ func (h *Handler) mergeHeaderParams(r *http.Request, sqlquery string, variables
|
||||
return sqlquery
|
||||
}
|
||||
|
||||
// sqlStripStringLiterals removes the contents of single-quoted string literals from SQL,
|
||||
// leaving the structural identifiers (column names, table names) intact.
|
||||
// Used to check column presence without matching inside string arguments.
|
||||
func sqlStripStringLiterals(sql string) string {
|
||||
re := regexp.MustCompile(`'(?:[^']|'')*'`)
|
||||
return re.ReplaceAllString(sql, "''")
|
||||
}
|
||||
|
||||
// sqlSelectList returns the column list portion of a SELECT query (between SELECT and FROM).
|
||||
// Returns the full query lowercased if no clear SELECT…FROM boundary is found.
|
||||
func sqlSelectList(sql string) string {
|
||||
lower := strings.ToLower(sql)
|
||||
selectPos := strings.Index(lower, "select ")
|
||||
fromPos := strings.Index(lower, " from ")
|
||||
if selectPos < 0 || fromPos <= selectPos {
|
||||
return lower
|
||||
}
|
||||
return lower[selectPos+7 : fromPos]
|
||||
}
|
||||
|
||||
// replaceMetaVariables replaces meta variables like [rid_user], [user], etc. in the SQL query
|
||||
func (h *Handler) replaceMetaVariables(sqlquery string, r *http.Request, userCtx *security.UserContext, metainfo map[string]interface{}, variables map[string]interface{}) string {
|
||||
if strings.Contains(sqlquery, "[p_meta_default]") {
|
||||
@@ -991,8 +1027,8 @@ func getReplacementForBlankParam(sqlquery, param string) string {
|
||||
charAfter = sqlquery[endIdx]
|
||||
}
|
||||
|
||||
// Check if parameter is surrounded by quotes (single quote or dollar sign for PostgreSQL dollar-quoted strings)
|
||||
if (charBefore == '\'' || charBefore == '$') && (charAfter == '\'' || charAfter == '$') {
|
||||
// Check if parameter is surrounded by quotes (single quote, dollar sign for PostgreSQL dollar-quoted strings, or double quote for JSON string values)
|
||||
if (charBefore == '\'' || charBefore == '$' || charBefore == '"') && (charAfter == '\'' || charAfter == '$' || charAfter == '"') {
|
||||
// Parameter is in quotes, return empty string
|
||||
return ""
|
||||
}
|
||||
|
||||
@@ -851,6 +851,285 @@ func TestReplaceMetaVariables(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// TestSqlStripStringLiterals tests that single-quoted string literals are removed
|
||||
func TestSqlStripStringLiterals(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
input string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "No string literals",
|
||||
input: "SELECT rid, rid_parent FROM users",
|
||||
expected: "SELECT rid, rid_parent FROM users",
|
||||
},
|
||||
{
|
||||
name: "Simple string literal",
|
||||
input: "SELECT * FROM users WHERE mode = 'admin'",
|
||||
expected: "SELECT * FROM users WHERE mode = ''",
|
||||
},
|
||||
{
|
||||
name: "JSON argument containing column names",
|
||||
input: `SELECT rid, rid_parent FROM crm_get_menu(1,'mode', '{"rid_parent":"[rid_parent]","CF:STARTDATE":"[cf_startdate]"}')`,
|
||||
expected: `SELECT rid, rid_parent FROM crm_get_menu(1,'', '')`,
|
||||
},
|
||||
{
|
||||
name: "Escaped single quotes inside literal",
|
||||
input: "SELECT * FROM t WHERE name = 'O''Brien'",
|
||||
expected: "SELECT * FROM t WHERE name = ''",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := sqlStripStringLiterals(tt.input)
|
||||
if result != tt.expected {
|
||||
t.Errorf("sqlStripStringLiterals() =\n %q\nwant\n %q", result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestAllowFilterDoesNotMatchInsideJsonArgument verifies that AllowFilter will add WHERE
|
||||
// clauses for real output columns (rid, rid_parent) but not for names that only appear
|
||||
// inside a JSON string argument (cf_startdate, cf_rid_branch).
|
||||
func TestAllowFilterDoesNotMatchInsideJsonArgument(t *testing.T) {
|
||||
handler := NewHandler(&MockDatabase{})
|
||||
|
||||
sqlQuery := `select rid, rid_parent, description
|
||||
from crm_get_menu([rid_user],'[p_mode]', 0, '', '{"rid_parent":"[rid_parent]", "CF:STARTDATE": "[cf_startdate]", "CF:RID_BRANCH": "[cf_rid_branch]"}')`
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
queryParams map[string]string
|
||||
checkResult func(t *testing.T, result string)
|
||||
}{
|
||||
{
|
||||
name: "rid_parent=0 is a real column — filter applied",
|
||||
queryParams: map[string]string{"rid_parent": "0"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if !strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Error("Expected WHERE clause to be added for rid_parent")
|
||||
}
|
||||
if !strings.Contains(result, "rid_parent = 0 OR") && !strings.Contains(result, "rid_parent IS NULL") {
|
||||
t.Errorf("Expected null-safe filter for rid_parent=0, got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "cf_startdate only appears in JSON string — no filter applied",
|
||||
queryParams: map[string]string{"cf_startdate": "2024-01-01"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Errorf("Expected no WHERE clause for cf_startdate (only in JSON arg), got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "cf_rid_branch only appears in JSON string — no filter applied",
|
||||
queryParams: map[string]string{"cf_rid_branch": "5"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Errorf("Expected no WHERE clause for cf_rid_branch (only in JSON arg), got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "description is a real column — filter applied",
|
||||
queryParams: map[string]string{"description": "test"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if !strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Error("Expected WHERE clause for description")
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
req := createTestRequest("GET", "/test", tt.queryParams, nil, nil)
|
||||
variables := make(map[string]interface{})
|
||||
propQry := make(map[string]string)
|
||||
|
||||
result := handler.mergeQueryParams(req, sqlQuery, variables, true, propQry)
|
||||
tt.checkResult(t, result)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestAllowFilterDoesNotMatchFunctionParams verifies that query params that appear only
|
||||
// as function call arguments in the FROM clause (e.g. [p_rid_doctype]) are not treated
|
||||
// as column filters, since they are not in the SELECT list.
|
||||
func TestAllowFilterDoesNotMatchFunctionParams(t *testing.T) {
|
||||
handler := NewHandler(&MockDatabase{})
|
||||
|
||||
sqlQuery := `select rid, rid_parent, description, row_cnt, filterstring, tableprefix, rid_table, tooltip, additionalfilter, haschildren
|
||||
from crm_get_doc_menu($JQ$[p_tableprefix]$JQ$,[p_rid_parent],[p_rid_doctype],[p_removedup],[p_showall]) r`
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
queryParams map[string]string
|
||||
checkResult func(t *testing.T, result string)
|
||||
}{
|
||||
{
|
||||
name: "p_rid_doctype is a function param, not a column — no filter applied",
|
||||
queryParams: map[string]string{"p_rid_doctype": "0"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Errorf("Expected no WHERE clause for p_rid_doctype (function arg, not SELECT column), got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "p_showall is a function param, not a column — no filter applied",
|
||||
queryParams: map[string]string{"p_showall": "1"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Errorf("Expected no WHERE clause for p_showall (function arg, not SELECT column), got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "rid is a SELECT column — filter applied",
|
||||
queryParams: map[string]string{"rid": "42"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if !strings.Contains(strings.ToLower(result), "where") {
|
||||
t.Error("Expected WHERE clause for rid (real SELECT column)")
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
req := createTestRequest("GET", "/test", tt.queryParams, nil, nil)
|
||||
variables := make(map[string]interface{})
|
||||
propQry := make(map[string]string)
|
||||
result := handler.mergeQueryParams(req, sqlQuery, variables, true, propQry)
|
||||
tt.checkResult(t, result)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetReplacementForBlankParamDoubleQuote verifies that placeholders surrounded by
|
||||
// double quotes (as in JSON string values) are blanked to "" not NULL.
|
||||
func TestGetReplacementForBlankParamDoubleQuote(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
sqlQuery string
|
||||
param string
|
||||
expected string
|
||||
}{
|
||||
{
|
||||
name: "Parameter in double quotes (JSON value)",
|
||||
sqlQuery: `SELECT * FROM f(1, '{"key":"[myparam]"}')`,
|
||||
param: "[myparam]",
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
name: "Parameter not in any quotes",
|
||||
sqlQuery: `SELECT * FROM f([myparam])`,
|
||||
param: "[myparam]",
|
||||
expected: "NULL",
|
||||
},
|
||||
{
|
||||
name: "Parameter in single quotes",
|
||||
sqlQuery: `SELECT * FROM f('[myparam]')`,
|
||||
param: "[myparam]",
|
||||
expected: "",
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
result := getReplacementForBlankParam(tt.sqlQuery, tt.param)
|
||||
if result != tt.expected {
|
||||
t.Errorf("getReplacementForBlankParam() = %q, want %q\nquery: %s", result, tt.expected, tt.sqlQuery)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestVariableReplacementFromQueryParams verifies that query params matching [placeholder]
|
||||
// tokens are substituted even when they don't have the p- prefix.
|
||||
func TestVariableReplacementFromQueryParams(t *testing.T) {
|
||||
handler := NewHandler(&MockDatabase{})
|
||||
|
||||
sqlQuery := `select rid, rid_parent from crm_get_menu([rid_user],'[p_mode]', 0, '', '{"rid_parent":"[rid_parent]","CF:STARTDATE":"[cf_startdate]"}')`
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
queryParams map[string]string
|
||||
checkResult func(t *testing.T, result string)
|
||||
}{
|
||||
{
|
||||
name: "rid_parent replaced from query param",
|
||||
queryParams: map[string]string{"rid_parent": "42"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(result, "[rid_parent]") {
|
||||
t.Errorf("Expected [rid_parent] to be replaced, still present in:\n%s", result)
|
||||
}
|
||||
if !strings.Contains(result, "42") {
|
||||
t.Errorf("Expected value 42 in query, got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "cf_startdate replaced from query param",
|
||||
queryParams: map[string]string{"cf_startdate": "2024-01-01"},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
if strings.Contains(result, "[cf_startdate]") {
|
||||
t.Errorf("Expected [cf_startdate] to be replaced, still present in:\n%s", result)
|
||||
}
|
||||
if !strings.Contains(result, "2024-01-01") {
|
||||
t.Errorf("Expected date value in query, got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "missing param blanked to empty string inside JSON (double-quoted)",
|
||||
queryParams: map[string]string{},
|
||||
checkResult: func(t *testing.T, result string) {
|
||||
// [cf_startdate] is surrounded by " in the JSON — should blank to ""
|
||||
if strings.Contains(result, "[cf_startdate]") {
|
||||
t.Errorf("Expected [cf_startdate] to be blanked, still present in:\n%s", result)
|
||||
}
|
||||
if strings.Contains(result, "NULL") && strings.Contains(result, "cf_startdate") {
|
||||
t.Errorf("Expected empty string (not NULL) for double-quoted placeholder, got:\n%s", result)
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
inputvars := make([]string, 0)
|
||||
q := handler.extractInputVariables(sqlQuery, &inputvars)
|
||||
|
||||
req := createTestRequest("GET", "/test", tt.queryParams, nil, nil)
|
||||
variables := make(map[string]interface{})
|
||||
propQry := make(map[string]string)
|
||||
|
||||
q = handler.mergeQueryParams(req, q, variables, false, propQry)
|
||||
|
||||
// Simulate the variable replacement + blank-param loop (mirrors function_api.go)
|
||||
for _, kw := range inputvars {
|
||||
varName := kw[1 : len(kw)-1]
|
||||
if val, ok := variables[varName]; ok {
|
||||
if strVal := strings.TrimSpace(val.(string)); strVal != "" {
|
||||
q = strings.ReplaceAll(q, kw, ValidSQL(strVal, "colvalue"))
|
||||
continue
|
||||
}
|
||||
}
|
||||
replacement := getReplacementForBlankParam(q, kw)
|
||||
q = strings.ReplaceAll(q, kw, replacement)
|
||||
}
|
||||
|
||||
tt.checkResult(t, q)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetReplacementForBlankParam tests the blank parameter replacement logic
|
||||
func TestGetReplacementForBlankParam(t *testing.T) {
|
||||
tests := []struct {
|
||||
|
||||
@@ -76,9 +76,14 @@ func GetJSONNameForField(modelType reflect.Type, fieldName string) string {
|
||||
return ""
|
||||
}
|
||||
|
||||
// Handle pointer types
|
||||
if modelType.Kind() == reflect.Ptr {
|
||||
modelType = modelType.Elem()
|
||||
// Unwrap pointer and slice indirections to reach the struct type
|
||||
for {
|
||||
switch modelType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
modelType = modelType.Elem()
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if modelType.Kind() != reflect.Struct {
|
||||
|
||||
@@ -541,9 +541,14 @@ func collectSQLColumnsFromType(typ reflect.Type, columns *[]string, scanOnlyEmbe
|
||||
func IsColumnWritable(model any, columnName string) bool {
|
||||
modelType := reflect.TypeOf(model)
|
||||
|
||||
// Unwrap pointers to get to the base struct type
|
||||
for modelType != nil && modelType.Kind() == reflect.Pointer {
|
||||
modelType = modelType.Elem()
|
||||
// Unwrap pointers and slices to get to the base struct type
|
||||
for modelType != nil {
|
||||
switch modelType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
modelType = modelType.Elem()
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
// Validate that we have a struct type
|
||||
@@ -878,8 +883,14 @@ func GetRelationType(model interface{}, fieldName string) RelationType {
|
||||
return RelationUnknown
|
||||
}
|
||||
|
||||
if modelType.Kind() == reflect.Ptr {
|
||||
modelType = modelType.Elem()
|
||||
// Unwrap pointer → slice → pointer chains to reach the underlying struct
|
||||
for {
|
||||
switch modelType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
modelType = modelType.Elem()
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||
@@ -1472,9 +1483,14 @@ func convertToFloat64(value interface{}) (float64, bool) {
|
||||
func GetValidJSONFieldNames(modelType reflect.Type) map[string]bool {
|
||||
validFields := make(map[string]bool)
|
||||
|
||||
// Unwrap pointers to get to the base struct type
|
||||
for modelType != nil && modelType.Kind() == reflect.Pointer {
|
||||
modelType = modelType.Elem()
|
||||
// Unwrap pointers and slices to get to the base struct type
|
||||
for modelType != nil {
|
||||
switch modelType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
modelType = modelType.Elem()
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||
@@ -1535,8 +1551,13 @@ func getRelationModelSingleLevel(model interface{}, fieldName string) interface{
|
||||
return nil
|
||||
}
|
||||
|
||||
if modelType.Kind() == reflect.Ptr {
|
||||
modelType = modelType.Elem()
|
||||
for {
|
||||
switch modelType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
modelType = modelType.Elem()
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if modelType == nil || modelType.Kind() != reflect.Struct {
|
||||
@@ -1599,17 +1620,16 @@ func getRelationModelSingleLevel(model interface{}, fieldName string) interface{
|
||||
return nil
|
||||
}
|
||||
|
||||
if targetType.Kind() == reflect.Slice {
|
||||
targetType = targetType.Elem()
|
||||
if targetType == nil {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
if targetType.Kind() == reflect.Ptr {
|
||||
targetType = targetType.Elem()
|
||||
if targetType == nil {
|
||||
return nil
|
||||
for {
|
||||
switch targetType.Kind() {
|
||||
case reflect.Ptr, reflect.Slice:
|
||||
targetType = targetType.Elem()
|
||||
if targetType == nil {
|
||||
return nil
|
||||
}
|
||||
continue
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
if targetType.Kind() != reflect.Struct {
|
||||
|
||||
@@ -603,7 +603,7 @@ func (h *Handler) handleCreate(ctx context.Context, w common.ResponseWriter, dat
|
||||
// Standard processing without nested relations
|
||||
query := h.db.NewInsert().Table(tableName)
|
||||
for key, value := range v {
|
||||
query = query.Value(key, value)
|
||||
query = query.Value(key, common.ConvertSliceForBun(value))
|
||||
}
|
||||
result, err := query.Exec(ctx)
|
||||
if err != nil {
|
||||
@@ -669,7 +669,7 @@ func (h *Handler) handleCreate(ctx context.Context, w common.ResponseWriter, dat
|
||||
for _, item := range v {
|
||||
txQuery := tx.NewInsert().Table(tableName)
|
||||
for key, value := range item {
|
||||
txQuery = txQuery.Value(key, value)
|
||||
txQuery = txQuery.Value(key, common.ConvertSliceForBun(value))
|
||||
}
|
||||
if _, err := txQuery.Exec(ctx); err != nil {
|
||||
return err
|
||||
@@ -747,7 +747,7 @@ func (h *Handler) handleCreate(ctx context.Context, w common.ResponseWriter, dat
|
||||
if itemMap, ok := item.(map[string]interface{}); ok {
|
||||
txQuery := tx.NewInsert().Table(tableName)
|
||||
for key, value := range itemMap {
|
||||
txQuery = txQuery.Value(key, value)
|
||||
txQuery = txQuery.Value(key, common.ConvertSliceForBun(value))
|
||||
}
|
||||
if _, err := txQuery.Exec(ctx); err != nil {
|
||||
return err
|
||||
|
||||
@@ -575,11 +575,25 @@ func (h *Handler) handleRead(ctx context.Context, w common.ResponseWriter, id st
|
||||
}
|
||||
}
|
||||
|
||||
// Apply custom SQL JOIN clauses
|
||||
// Apply custom SQL JOIN clauses, skipping any whose alias is already provided by a
|
||||
// preload LEFT JOIN (to prevent "table name specified more than once" errors).
|
||||
if len(options.CustomSQLJoin) > 0 {
|
||||
for _, joinClause := range options.CustomSQLJoin {
|
||||
preloadAliasSet := make(map[string]bool, len(options.Preload))
|
||||
for _, p := range options.Preload {
|
||||
if alias := common.RelationPathToBunAlias(p.Relation); alias != "" {
|
||||
preloadAliasSet[alias] = true
|
||||
}
|
||||
}
|
||||
|
||||
for i, joinClause := range options.CustomSQLJoin {
|
||||
if i < len(options.JoinAliases) && options.JoinAliases[i] != "" {
|
||||
alias := strings.ToLower(options.JoinAliases[i])
|
||||
if preloadAliasSet[alias] {
|
||||
logger.Debug("Skipping custom SQL JOIN (alias '%s' already joined by preload): %s", alias, joinClause)
|
||||
continue
|
||||
}
|
||||
}
|
||||
logger.Debug("Applying custom SQL JOIN: %s", joinClause)
|
||||
// Joins are already sanitized during parsing, so we can apply them directly
|
||||
query = query.Join(joinClause)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@@ -501,6 +502,31 @@ func (h *Handler) parseExpand(options *ExtendedRequestOptions, value string) {
|
||||
}
|
||||
}
|
||||
|
||||
// reMultiJoinBoundary finds the start of each individual JOIN clause within a string that
|
||||
// may contain multiple consecutive JOIN clauses (e.g., "INNER JOIN ... LEFT OUTER JOIN ...").
|
||||
var reMultiJoinBoundary = regexp.MustCompile(`(?i)(?:inner|left(?:\s+outer)?|right(?:\s+outer)?|full(?:\s+outer)?|cross)\s+join\b`)
|
||||
|
||||
// splitJoinClauses splits a SQL string that may contain multiple JOIN clauses into
|
||||
// individual clauses. A plain pipe-separated segment may itself contain several JOINs;
|
||||
// this function splits them so each gets its own alias entry.
|
||||
func splitJoinClauses(joinStr string) []string {
|
||||
indices := reMultiJoinBoundary.FindAllStringIndex(joinStr, -1)
|
||||
if len(indices) <= 1 {
|
||||
return []string{strings.TrimSpace(joinStr)}
|
||||
}
|
||||
parts := make([]string, 0, len(indices))
|
||||
for i, idx := range indices {
|
||||
end := len(joinStr)
|
||||
if i+1 < len(indices) {
|
||||
end = indices[i+1][0]
|
||||
}
|
||||
if part := strings.TrimSpace(joinStr[idx[0]:end]); part != "" {
|
||||
parts = append(parts, part)
|
||||
}
|
||||
}
|
||||
return parts
|
||||
}
|
||||
|
||||
// parseCustomSQLJoin parses x-custom-sql-join header
|
||||
// Format: Single JOIN clause or multiple JOIN clauses separated by |
|
||||
// Example: "LEFT JOIN departments d ON d.id = employees.department_id"
|
||||
@@ -533,17 +559,19 @@ func (h *Handler) parseCustomSQLJoin(options *ExtendedRequestOptions, value stri
|
||||
continue
|
||||
}
|
||||
|
||||
// Extract table alias from the JOIN clause
|
||||
alias := extractJoinAlias(sanitizedJoin)
|
||||
if alias != "" {
|
||||
// Split into individual JOIN clauses so each clause gets its own alias entry.
|
||||
// CustomSQLJoin and JoinAliases are kept parallel (one entry per individual clause).
|
||||
for _, clause := range splitJoinClauses(sanitizedJoin) {
|
||||
alias := extractJoinAlias(clause)
|
||||
// Keep arrays parallel; use empty string when alias cannot be extracted.
|
||||
options.JoinAliases = append(options.JoinAliases, alias)
|
||||
// Also add to the embedded RequestOptions for validation
|
||||
options.RequestOptions.JoinAliases = append(options.RequestOptions.JoinAliases, alias)
|
||||
logger.Debug("Extracted join alias: %s", alias)
|
||||
if alias != "" {
|
||||
logger.Debug("Extracted join alias: %s", alias)
|
||||
}
|
||||
logger.Debug("Adding custom SQL join: %s", clause)
|
||||
options.CustomSQLJoin = append(options.CustomSQLJoin, clause)
|
||||
}
|
||||
|
||||
logger.Debug("Adding custom SQL join: %s", sanitizedJoin)
|
||||
options.CustomSQLJoin = append(options.CustomSQLJoin, sanitizedJoin)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
755
pkg/spectypes/sql_array_types.go
Normal file
755
pkg/spectypes/sql_array_types.go
Normal file
@@ -0,0 +1,755 @@
|
||||
package spectypes
|
||||
|
||||
import (
|
||||
"database/sql/driver"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// parsePostgresArrayElements parses a PostgreSQL array literal (e.g. `{a,"b,c",d}`)
|
||||
// into a slice of raw string elements. Each element retains its unquoted/unescaped value.
|
||||
func parsePostgresArrayElements(s string) ([]string, error) {
|
||||
s = strings.TrimSpace(s)
|
||||
if s == "" || strings.EqualFold(s, "null") || strings.EqualFold(s, "NULL") {
|
||||
return nil, nil
|
||||
}
|
||||
if !strings.HasPrefix(s, "{") || !strings.HasSuffix(s, "}") {
|
||||
return nil, fmt.Errorf("not a valid PostgreSQL array literal: %q", s)
|
||||
}
|
||||
inner := s[1 : len(s)-1]
|
||||
if inner == "" {
|
||||
return []string{}, nil
|
||||
}
|
||||
|
||||
var result []string
|
||||
var cur strings.Builder
|
||||
inQuotes := false
|
||||
i := 0
|
||||
for i < len(inner) {
|
||||
c := inner[i]
|
||||
switch {
|
||||
case c == '"' && !inQuotes:
|
||||
inQuotes = true
|
||||
case c == '"' && inQuotes:
|
||||
if i+1 < len(inner) && inner[i+1] == '"' {
|
||||
cur.WriteByte('"')
|
||||
i++
|
||||
} else {
|
||||
inQuotes = false
|
||||
}
|
||||
case c == '\\' && inQuotes:
|
||||
if i+1 < len(inner) {
|
||||
cur.WriteByte(inner[i+1])
|
||||
i++
|
||||
}
|
||||
case c == ',' && !inQuotes:
|
||||
result = append(result, cur.String())
|
||||
cur.Reset()
|
||||
default:
|
||||
cur.WriteByte(c)
|
||||
}
|
||||
i++
|
||||
}
|
||||
result = append(result, cur.String())
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// formatPostgresStringArray formats a []string back into a PostgreSQL array literal.
|
||||
func formatPostgresStringArray(vals []string) string {
|
||||
if vals == nil {
|
||||
return "NULL"
|
||||
}
|
||||
parts := make([]string, len(vals))
|
||||
for i, v := range vals {
|
||||
// Quote if value contains comma, double-quote, backslash, braces, whitespace, or is empty.
|
||||
needsQuote := v == "" || strings.ContainsAny(v, `,"\\{}`+"\t\n\r ")
|
||||
if needsQuote {
|
||||
v = strings.ReplaceAll(v, `\`, `\\`)
|
||||
v = strings.ReplaceAll(v, `"`, `""`)
|
||||
parts[i] = `"` + v + `"`
|
||||
} else {
|
||||
parts[i] = v
|
||||
}
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}"
|
||||
}
|
||||
|
||||
// ── SqlStringArray ───────────────────────────────────────────────────────────
|
||||
|
||||
// SqlStringArray is a nullable PostgreSQL text[] / varchar[] array.
|
||||
type SqlStringArray struct {
|
||||
Val []string
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlStringArray) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlStringArray: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = elems
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlStringArray) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
return formatPostgresStringArray(a.Val), nil
|
||||
}
|
||||
|
||||
func (a SqlStringArray) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlStringArray) UnmarshalJSON(b []byte) error {
|
||||
s := strings.TrimSpace(string(b))
|
||||
if s == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []string
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlStringArray(v []string) SqlStringArray {
|
||||
return SqlStringArray{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlInt16Array ────────────────────────────────────────────────────────────
|
||||
|
||||
type SqlInt16Array struct {
|
||||
Val []int16
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlInt16Array) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlInt16Array: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]int16, len(elems))
|
||||
for i, e := range elems {
|
||||
n, err := strconv.ParseInt(strings.TrimSpace(e), 10, 16)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlInt16Array: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = int16(n)
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlInt16Array) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = strconv.FormatInt(int64(v), 10)
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlInt16Array) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlInt16Array) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []int16
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlInt16Array(v []int16) SqlInt16Array {
|
||||
return SqlInt16Array{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlInt32Array ────────────────────────────────────────────────────────────
|
||||
|
||||
type SqlInt32Array struct {
|
||||
Val []int32
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlInt32Array) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlInt32Array: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]int32, len(elems))
|
||||
for i, e := range elems {
|
||||
n, err := strconv.ParseInt(strings.TrimSpace(e), 10, 32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlInt32Array: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = int32(n)
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlInt32Array) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = strconv.FormatInt(int64(v), 10)
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlInt32Array) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlInt32Array) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []int32
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlInt32Array(v []int32) SqlInt32Array {
|
||||
return SqlInt32Array{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlInt64Array ────────────────────────────────────────────────────────────
|
||||
|
||||
type SqlInt64Array struct {
|
||||
Val []int64
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlInt64Array) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlInt64Array: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]int64, len(elems))
|
||||
for i, e := range elems {
|
||||
n, err := strconv.ParseInt(strings.TrimSpace(e), 10, 64)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlInt64Array: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = n
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlInt64Array) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = strconv.FormatInt(v, 10)
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlInt64Array) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlInt64Array) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []int64
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlInt64Array(v []int64) SqlInt64Array {
|
||||
return SqlInt64Array{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlFloat32Array ──────────────────────────────────────────────────────────
|
||||
|
||||
type SqlFloat32Array struct {
|
||||
Val []float32
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlFloat32Array) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlFloat32Array: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]float32, len(elems))
|
||||
for i, e := range elems {
|
||||
f, err := strconv.ParseFloat(strings.TrimSpace(e), 32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlFloat32Array: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = float32(f)
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlFloat32Array) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = strconv.FormatFloat(float64(v), 'f', -1, 32)
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlFloat32Array) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlFloat32Array) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []float32
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlFloat32Array(v []float32) SqlFloat32Array {
|
||||
return SqlFloat32Array{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlFloat64Array ──────────────────────────────────────────────────────────
|
||||
|
||||
type SqlFloat64Array struct {
|
||||
Val []float64
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlFloat64Array) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlFloat64Array: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]float64, len(elems))
|
||||
for i, e := range elems {
|
||||
f, err := strconv.ParseFloat(strings.TrimSpace(e), 64)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlFloat64Array: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = f
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlFloat64Array) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = strconv.FormatFloat(v, 'f', -1, 64)
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlFloat64Array) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlFloat64Array) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []float64
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlFloat64Array(v []float64) SqlFloat64Array {
|
||||
return SqlFloat64Array{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlBoolArray ─────────────────────────────────────────────────────────────
|
||||
|
||||
type SqlBoolArray struct {
|
||||
Val []bool
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlBoolArray) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlBoolArray: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]bool, len(elems))
|
||||
for i, e := range elems {
|
||||
e = strings.ToLower(strings.TrimSpace(e))
|
||||
a.Val[i] = e == "t" || e == "true" || e == "1" || e == "yes"
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlBoolArray) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
if v {
|
||||
parts[i] = "t"
|
||||
} else {
|
||||
parts[i] = "f"
|
||||
}
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlBoolArray) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlBoolArray) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []bool
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlBoolArray(v []bool) SqlBoolArray {
|
||||
return SqlBoolArray{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlUUIDArray ─────────────────────────────────────────────────────────────
|
||||
|
||||
type SqlUUIDArray struct {
|
||||
Val []uuid.UUID
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (a *SqlUUIDArray) Scan(value any) error {
|
||||
if value == nil {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch v := value.(type) {
|
||||
case string:
|
||||
s = v
|
||||
case []byte:
|
||||
s = string(v)
|
||||
default:
|
||||
return fmt.Errorf("SqlUUIDArray: cannot scan type %T", value)
|
||||
}
|
||||
elems, err := parsePostgresArrayElements(s)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = make([]uuid.UUID, len(elems))
|
||||
for i, e := range elems {
|
||||
u, err := uuid.Parse(strings.TrimSpace(e))
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlUUIDArray: element %d %q: %w", i, e, err)
|
||||
}
|
||||
a.Val[i] = u
|
||||
}
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a SqlUUIDArray) Value() (driver.Value, error) {
|
||||
if !a.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(a.Val))
|
||||
for i, v := range a.Val {
|
||||
parts[i] = v.String()
|
||||
}
|
||||
return "{" + strings.Join(parts, ",") + "}", nil
|
||||
}
|
||||
|
||||
func (a SqlUUIDArray) MarshalJSON() ([]byte, error) {
|
||||
if !a.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(a.Val)
|
||||
}
|
||||
|
||||
func (a *SqlUUIDArray) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
a.Valid = false
|
||||
a.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []uuid.UUID
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
a.Val = vals
|
||||
a.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlUUIDArray(v []uuid.UUID) SqlUUIDArray {
|
||||
return SqlUUIDArray{Val: v, Valid: true}
|
||||
}
|
||||
|
||||
// ── SqlVector ────────────────────────────────────────────────────────────────
|
||||
|
||||
// SqlVector is a nullable pgvector `vector` type backed by []float32.
|
||||
// Wire format: `[1.0,2.0,3.0]` (square brackets, comma-separated floats).
|
||||
type SqlVector struct {
|
||||
Val []float32
|
||||
Valid bool
|
||||
}
|
||||
|
||||
func (v *SqlVector) Scan(value any) error {
|
||||
if value == nil {
|
||||
v.Valid = false
|
||||
v.Val = nil
|
||||
return nil
|
||||
}
|
||||
var s string
|
||||
switch val := value.(type) {
|
||||
case string:
|
||||
s = val
|
||||
case []byte:
|
||||
s = string(val)
|
||||
default:
|
||||
return fmt.Errorf("SqlVector: cannot scan type %T", value)
|
||||
}
|
||||
s = strings.TrimSpace(s)
|
||||
if !strings.HasPrefix(s, "[") || !strings.HasSuffix(s, "]") {
|
||||
return fmt.Errorf("SqlVector: not a valid vector literal: %q", s)
|
||||
}
|
||||
inner := s[1 : len(s)-1]
|
||||
if inner == "" {
|
||||
v.Val = []float32{}
|
||||
v.Valid = true
|
||||
return nil
|
||||
}
|
||||
parts := strings.Split(inner, ",")
|
||||
v.Val = make([]float32, len(parts))
|
||||
for i, p := range parts {
|
||||
f, err := strconv.ParseFloat(strings.TrimSpace(p), 32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("SqlVector: element %d %q: %w", i, p, err)
|
||||
}
|
||||
v.Val[i] = float32(f)
|
||||
}
|
||||
v.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v SqlVector) Value() (driver.Value, error) {
|
||||
if !v.Valid {
|
||||
return nil, nil
|
||||
}
|
||||
parts := make([]string, len(v.Val))
|
||||
for i, f := range v.Val {
|
||||
parts[i] = strconv.FormatFloat(float64(f), 'f', -1, 32)
|
||||
}
|
||||
return "[" + strings.Join(parts, ",") + "]", nil
|
||||
}
|
||||
|
||||
func (v SqlVector) MarshalJSON() ([]byte, error) {
|
||||
if !v.Valid {
|
||||
return []byte("null"), nil
|
||||
}
|
||||
return json.Marshal(v.Val)
|
||||
}
|
||||
|
||||
func (v *SqlVector) UnmarshalJSON(b []byte) error {
|
||||
if strings.TrimSpace(string(b)) == "null" {
|
||||
v.Valid = false
|
||||
v.Val = nil
|
||||
return nil
|
||||
}
|
||||
var vals []float32
|
||||
if err := json.Unmarshal(b, &vals); err != nil {
|
||||
return err
|
||||
}
|
||||
v.Val = vals
|
||||
v.Valid = true
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewSqlVector(val []float32) SqlVector {
|
||||
return SqlVector{Val: val, Valid: true}
|
||||
}
|
||||
@@ -174,6 +174,7 @@ func (h *Handler) handleRequest(conn *Connection, msg *Message) {
|
||||
Options: msg.Options,
|
||||
ID: recordID,
|
||||
Data: msg.Data,
|
||||
Tx: h.db,
|
||||
Metadata: make(map[string]interface{}),
|
||||
}
|
||||
|
||||
|
||||
@@ -111,6 +111,9 @@ type HookContext struct {
|
||||
AbortMessage string // Message to return if aborted
|
||||
AbortCode int // HTTP status code if aborted
|
||||
|
||||
// Tx provides access to the database/transaction for executing additional SQL
|
||||
Tx common.Database
|
||||
|
||||
// Metadata is additional context data
|
||||
Metadata map[string]interface{}
|
||||
}
|
||||
|
||||
1
todo.md
1
todo.md
@@ -92,6 +92,7 @@ See [`resolvespec-python/todo.md`](./resolvespec-python/todo.md) for detailed Py
|
||||
|
||||
- [ ] Long preload alias names may exceed PostgreSQL identifier limit
|
||||
- [ ] Some edge cases in computed column handling
|
||||
- [ ] `GormResult.LastInsertId()` (`pkg/common/adapters/database/gorm.go:936`) always returns `0, nil` — GORM does not expose last insert ID via `sql.Result` for most dialects. Auto-generated IDs from GORM inserts are not propagated back through `LastInsertId`, which breaks the ID-retrieval path in `recursive_crud.go`. Fix: read the ID back from the model struct after `Create()` using reflection, or use GORM's `Statement.LastInsertId`.
|
||||
|
||||
---
|
||||
|
||||
|
||||
Reference in New Issue
Block a user