Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions internal/stackql/astvisit/param_extract.go
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,16 @@ func (v *standardParserParamAstVisitor) Visit(node sqlparser.SQLNode) error {
rt,
v.getNextOrdinal(),
))
case sqlparser.BoolVal:
k, err := parserutil.NewUnknownTypeColumnarReference(lt)
if err != nil {
return err
}
v.params.Set(k, parserutil.NewComparisonParameterMetadata(
node,
rt,
v.getNextOrdinal(),
))
case *sqlparser.ColName:
k, err := parserutil.NewUnknownTypeColumnarReference(lt)
if err != nil {
Expand Down
10 changes: 10 additions & 0 deletions internal/stackql/astvisit/placeholder_param_extract.go
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,16 @@ func (v *standardParserPlaceholderParamAstVisitor) Visit(node sqlparser.SQLNode)
rt,
0,
))
case sqlparser.BoolVal:
k, err := parserutil.NewUnknownTypeColumnarReference(lt)
if err != nil {
return err
}
v.params.SetIntolerant(k, parserutil.NewComparisonParameterMetadata(
node,
rt,
0,
))
default:
}
default:
Expand Down
8 changes: 7 additions & 1 deletion internal/stackql/primitivegenerator/statement_analyzer.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"regexp"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -444,9 +445,14 @@ func (pb *standardPrimitiveGenerator) whereComparisonExprCopyAndReWrite(
}
if symTabErr == nil && symTabEntry.In != "server" {
if !(requiredParamPresent || optionalParamPresent) {
rightExpr := expr.Right
if boolVal, boolOk := expr.Right.(sqlparser.BoolVal); boolOk {
// Provider-backed rows are often materialized as text, so normalize bool literals.
rightExpr = &sqlparser.SQLVal{Type: sqlparser.StrVal, Val: []byte(strconv.FormatBool(bool(boolVal)))}
}
return &sqlparser.ComparisonExpr{
Left: expr.Left,
Right: expr.Right,
Right: rightExpr,
Operator: expr.Operator,
Escape: expr.Escape,
}, colName, nil
Expand Down
4 changes: 4 additions & 0 deletions internal/stackql/util/plan_utility.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ func ExtractSQLNodeParams(
case *sqlparser.SQLVal:
val := string(r.Val)
paramMap[key] = val
case sqlparser.BoolVal:
paramMap[key] = strconv.FormatBool(bool(r))
case *sqlparser.ColName:
kr := r.Name.GetRawVal()
paramMap[key] = kr
Expand Down Expand Up @@ -198,6 +200,8 @@ func TransformSQLRawParameters(input map[string]interface{}, ignoreTuples bool)

func extractRaw(raw interface{}, ignoreTuples bool) (interface{}, error) {
switch r := raw.(type) {
case sqlparser.BoolVal:
return strconv.FormatBool(bool(r)), nil
case *sqlparser.SQLVal:
switch r.Type { //nolint:exhaustive // TODO: review
case sqlparser.StrVal:
Expand Down
7 changes: 0 additions & 7 deletions test/python/stackql_test_tooling/stackql_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
_BUILD_MINOR_VERSION = os.environ.get('BUILDMINORVERSION', '1')
_BUILD_PATCH_VERSION = os.environ.get('BUILDPATCHVERSION', '1')

_SHELL_WELCOME_MSG = """
""" + f"stackql Command Shell {_BUILD_MAJOR_VERSION}.{_BUILD_MINOR_VERSION}.{_BUILD_PATCH_VERSION}" + """
Copyright (c) 2021, stackql studios. All rights reserved.
Welcome to the interactive shell for running stackql commands.
---
"""

def get_shell_welcome_stdout(env: str) -> str:
return ''

Expand Down
21 changes: 21 additions & 0 deletions test/robot/functional/stackql_mocked_from_cmd_line.robot
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,27 @@ AWS EC2 Volumes Select Simple
... ${SELECT_AWS_VOLUMES}
... ${SELECT_AWS_VOLUMES_ASC_EXPECTED}

AWS EC2 Volumes Boolean Predicate Literal and String Equivalence
${inputStr} = Catenate
... select volumeId, encrypted, size from aws.ec2.volumes where region = 'ap-southeast-1' and encrypted = false order by volumeId asc;
... select volumeId, encrypted, size from aws.ec2.volumes where region = 'ap-southeast-1' and encrypted = 'false' order by volumeId asc;
${outputStr} = Catenate SEPARATOR=\n
... ${SELECT_AWS_VOLUMES_ASC_EXPECTED}
... ${SELECT_AWS_VOLUMES_ASC_EXPECTED}
Should Stackql Exec Inline Equal Both Streams
... ${STACKQL_EXE}
... ${OKTA_SECRET_STR}
... ${GITHUB_SECRET_STR}
... ${K8S_SECRET_STR}
... ${REGISTRY_NO_VERIFY_CFG_STR}
... ${AUTH_CFG_STR}
... ${SQL_BACKEND_CFG_STR_CANONICAL}
... ${inputStr}
... ${outputStr}
... ${EMPTY}
... stdout=${CURDIR}/tmp/AWS-EC2-Volumes-Boolean-Predicate-Literal-and-String-Equivalence-stdout.tmp
... stderr=${CURDIR}/tmp/AWS-EC2-Volumes-Boolean-Predicate-Literal-and-String-Equivalence-stderr.tmp

AWS IAM Users Select Simple
Should Horrid Query StackQL Inline Equal
... ${STACKQL_EXE}
Expand Down
Loading