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
1 change: 1 addition & 0 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@ jobs:

- shell: wsl-bash {0}
name: Output from mocked functional tests
if: always()
run: |
cat ./output.xml

Expand Down
6 changes: 1 addition & 5 deletions internal/stackql/primitivebuilder/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@ func prepareGolangResult(
)
logging.GetLogger().Infoln(fmt.Sprintf("select result = %v, error = %v", r, sqlErr))
if sqlErr != nil {
errWriter.Write(
[]byte(
fmt.Sprintf("sql SELECT error = %s\n", sqlErr.Error()),
),
)
return internaldto.NewErroneousExecutorOutput(fmt.Errorf("sql SELECT error: %s", sqlErr.Error()))
}
altKeys, rawRows := drmCfg.ExtractObjectFromSQLRows(r, nonControlColumns, stream)
var cNames []string
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[
{ "Arn": "arn:aws:s3:::stackql-trial-bucket-01" }
]
8 changes: 8 additions & 0 deletions test/robot/functional/stackql_sessions.robot
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,14 @@ PG Session Postgres Client Typed Queries
... stdout=${CURDIR}/tmp/PG-Session-Postgres-Client-Typed-Queries.tmp
[Teardown] NONE

PG Session Server Survives Defective Query
Should PG Client Session Inline Equal
... ${PSQL_MTLS_CONN_STR_UNIX}
... ${AWS_CLOUD_CONTROL_BUCKET_DETAIL_PROJECTION_DEFECTIVE_CMD_ARR}
... ${AWS_CLOUD_CONTROL_BUCKET_DETAIL_PROJECTION_DEFECTIVE_CMD_ARR_EXPECTED}
... stdout=${CURDIR}/tmp/PG-Session-Server-Survives-Defective-Query-and-Subsequently-Serves-Valid-Query.tmp
[Teardown] NONE

PG Session Postgres Client V2 Typed Queries
Pass Execution If "${SQL_BACKEND}" == "postgres_tcp" TODO: FIX THIS... Skipping postgres backend test likely due to case sensitivity and incorrect XML property aliasing
Should PG Client V2 Session Inline Equal
Expand Down
9 changes: 6 additions & 3 deletions test/robot/lib/psycopg_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ def __init__(self, connection_string :str):
)


def _exec_query(self, query :str) -> typing.List[typing.Dict]:
r = self._connection.execute(query)
return r.fetchall()
def _exec_query(self, query :str) -> typing.List[typing.Dict]:
try:
r = self._connection.execute(query)
return r.fetchall()
except Exception as err:
return []


def _run_queries(self, queries :typing.List[str]) -> typing.List[typing.Dict]:
Expand Down
Loading