tomas/pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ui/dist

Browse Source
This commit is contained in:
Gani Georgiev
2023-04-03 20:30:25 +03:00
parent f31a3b133c
commit 8ca439e5f7
31 changed files with 50 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/search/filter.go
+9 -9
View File
@@ -242,18 +242,18 @@ func resolveEqualExpr(equal bool, left, right *ResolverResult) dbx.Expression {
isLeftEmpty := isEmptyIdentifier(left) || (len(left.Params) == 1 && hasEmptyParamValue(left))
isRightEmpty := isEmptyIdentifier(right) || (len(right.Params) == 1 && hasEmptyParamValue(right))
sign := "="
nullExpr := "IS NULL"
equalOp := "="
concatOp := "OR"
nullExpr := "IS NULL"
if !equal {
sign = "!="
nullExpr = "IS NOT NULL"
equalOp = "!="
concatOp = "AND"
nullExpr = "IS NOT NULL"
}
// both operands are empty
if isLeftEmpty && isRightEmpty {
return dbx.NewExp(fmt.Sprintf("'' %s ''", sign), mergeParams(left.Params, right.Params))
return dbx.NewExp(fmt.Sprintf("'' %s ''", equalOp), mergeParams(left.Params, right.Params))
}
// direct compare since at least one of the operands is known to be non-empty
@@ -268,7 +268,7 @@ func resolveEqualExpr(equal bool, left, right *ResolverResult) dbx.Expression {
rightIdentifier = "''"
}
return dbx.NewExp(
fmt.Sprintf("%s %s %s", leftIdentifier, sign, rightIdentifier),
fmt.Sprintf("%s %s %s", leftIdentifier, equalOp, rightIdentifier),
mergeParams(left.Params, right.Params),
)
}
@@ -277,7 +277,7 @@ func resolveEqualExpr(equal bool, left, right *ResolverResult) dbx.Expression {
// "" != b AND b IS NOT NULL
if isLeftEmpty {
return dbx.NewExp(
fmt.Sprintf("('' %s %s %s %s %s)", sign, right.Identifier, concatOp, right.Identifier, nullExpr),
fmt.Sprintf("('' %s %s %s %s %s)", equalOp, right.Identifier, concatOp, right.Identifier, nullExpr),
mergeParams(left.Params, right.Params),
)
}
@@ -286,7 +286,7 @@ func resolveEqualExpr(equal bool, left, right *ResolverResult) dbx.Expression {
// a != "" AND a IS NOT NULL
if isRightEmpty {
return dbx.NewExp(
fmt.Sprintf("(%s %s '' %s %s %s)", left.Identifier, sign, concatOp, left.Identifier, nullExpr),
fmt.Sprintf("(%s %s '' %s %s %s)", left.Identifier, equalOp, concatOp, left.Identifier, nullExpr),
mergeParams(left.Params, right.Params),
)
}
@@ -296,7 +296,7 @@ func resolveEqualExpr(equal bool, left, right *ResolverResult) dbx.Expression {
fmt.Sprintf(
"COALESCE(%s, '') %s COALESCE(%s, '')",
left.Identifier,
sign,
equalOp,
right.Identifier,
),
mergeParams(left.Params, right.Params),