Skip to content
Closed
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
41 changes: 40 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "promptString",
"id": "authString",
"description": "Auth Input arg String",
"default": "{ \"google\": { \"credentialsfilepath\": \"${workspaceFolder}/keys/sa-key.json\" }, \"okta\": { \"credentialsfilepath\": \"${workspaceFolder}/keys/okta-token.txt\", \"type\": \"api_key\" }, \"github\": { \"type\": \"basic\", \"credentialsfilepath\": \"${workspaceFolder}/keys/github-user-token.txt\" } }"
"default": "{ \"google\": { \"credentialsfilepath\": \"${workspaceFolder}/keys/sa-key.json\" }, \"okta\": { \"credentialsfilepath\": \"${workspaceFolder}/keys/okta-token.txt\", \"type\": \"api_key\" }, \"github\": { \"type\": \"basic\", \"credentialsfilepath\": \"${workspaceFolder}/keys/github-user-token.txt\" }, \"aws\": { \"type\": \"aws_signing_v4\", \"credentialsfilepath\": \"${workspaceFolder}/keys/integration/aws-secret-key.txt\", \"keyID\": \"AKIA376P4FQSS2ONB2NS\" }, \"netlify\": { \"type\": \"api_key\", \"valuePrefix\": \"Bearer \", \"credentialsfilepath\": \"${workspaceFolder}/keys/netlify-token.txt\" } }"
},
{
"type": "promptString",
Expand Down Expand Up @@ -136,6 +136,19 @@
"select kind, name from google.compute.acceleratorTypes where project = '${input:gcpProject}' and zone = 'australia-southeast1-a' order by name desc;"
],
},
{
"name": "DEBUG select NETLIFY sites ... ;",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/stackql",
"args": [
"exec",
"--registry=${input:registryString}",
"--auth=${input:authString}",
"select * from netlify.site.site;"
],
},
//
{
"name": "DEBUG select github.repos.repos ... ;",
Expand Down Expand Up @@ -382,6 +395,32 @@
"select apps.label from okta.application.apps apps where apps.subdomain = 'dev-79923018-admin';"
],
},
{
"name": "DEBUG aws select volumes ... ;",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/stackql",
"args": [
"exec",
"--registry=${input:registryString}",
"--auth=${input:authString}",
"select * from aws.ec2.volumes where region = 'ap-southeast-1';"
],
},
{
"name": "DEBUG k8s exec node list ... ;",
"type": "go",
"request": "launch",
"mode": "debug",
"program": "${workspaceFolder}/stackql",
"args": [
"exec",
"--registry=${input:registryString}",
"--auth=${input:authString}",
"exec /*+ SHOWRESULTS */ k8s.core_v1.Node.listCoreV1Node @server_address='35.244.65.136';"
],
},
{
"name": "DEBUG BYO API ... ;",
"type": "go",
Expand Down
4 changes: 4 additions & 0 deletions docs/developer_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,7 @@ time ./stackql exec --cpuprofile=./select-disks-improved-05.profile --auth='{ "g
2. Light touch option can be based upon:
- https://github.com/jeroenrinzema/psql-wire


## AWS HTTP request signing

https://docs.aws.amazon.com/sdk-for-go/api/aws/signer/v4/
10 changes: 8 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/stackql/stackql
go 1.18

require (
github.com/aws/aws-sdk-go v1.28.8
github.com/fatih/color v1.13.0
github.com/getkin/kin-openapi v0.88.0
github.com/google/go-jsonnet v0.17.0
Expand All @@ -15,11 +16,10 @@ require (
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.10.1
github.com/stackql/go-openapistackql v0.0.7-alpha01
github.com/stackql/go-openapistackql v0.0.7-beta01
github.com/stackql/go-sqlite3 v0.0.1-stackqlrc01
github.com/stackql/go-suffix-map v0.0.1-alpha01
go.uber.org/zap v1.21.0
golang.org/x/crypto v0.0.0-20220214200702-86341886e292
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
gonum.org/v1/gonum v0.11.0
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -31,17 +31,22 @@ require (
require (
cloud.google.com/go v0.99.0 // indirect
github.com/Masterminds/semver v1.4.2 // indirect
github.com/antchfx/xmlquery v1.3.10 // indirect
github.com/antchfx/xpath v1.2.0 // indirect
github.com/clbanning/mxj/v2 v2.5.5 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.7 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jackc/pgio v1.0.0 // indirect
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
Expand All @@ -59,6 +64,7 @@ require (
github.com/subosito/gotenv v1.2.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.7.0 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
Expand Down
33 changes: 13 additions & 20 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,10 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
github.com/antchfx/xmlquery v1.3.10 h1:U2yMwr8U0KmGM2iDG2Ky/3LfxNsiK4uw1bSBkeMO9+g=
github.com/antchfx/xmlquery v1.3.10/go.mod h1:wojC/BxjEkjJt6dPiAqUzoXO5nIMWtxHS8PD8TmN4ks=
github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
Expand All @@ -97,6 +101,7 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/aws/aws-sdk-go v1.28.8 h1:kPGnElMdW0GDc54Giy1lcE/3gAr2Gzl6cMjYKoBNFhw=
github.com/aws/aws-sdk-go v1.28.8/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
Expand All @@ -117,6 +122,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWs
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
github.com/clbanning/mxj/v2 v2.5.5 h1:oT81vUeEiQQ/DcHbzSytRngP6Ky9O+L+0Bw0zSJag9E=
github.com/clbanning/mxj/v2 v2.5.5/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
Expand Down Expand Up @@ -253,6 +260,8 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
Expand Down Expand Up @@ -432,6 +441,7 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
Expand Down Expand Up @@ -636,38 +646,20 @@ github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
github.com/stackql/color v0.0.1-rc01 h1:fq3Gj6gwskaZnQrDXfFYnDP6JyayGHy6Dp7I5P/V2u0=
github.com/stackql/color v0.0.1-rc01/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
github.com/stackql/go-openapistackql v0.0.6-beta24 h1:rpF9RTFXAulWBXHSx6UPQ4yCOePX1vGbWpZfCbuwas8=
github.com/stackql/go-openapistackql v0.0.6-beta24/go.mod h1:SdoMaYa3qsaE1nO/5BXcXqKyfOXAx1vxk4UpCDTpoKI=
github.com/stackql/go-openapistackql v0.0.6-rc01 h1:s5SS2gtzxxUYYO0+hmNQ8twC7v9kuRfWdXkGbUUfozM=
github.com/stackql/go-openapistackql v0.0.6-rc01/go.mod h1:SdoMaYa3qsaE1nO/5BXcXqKyfOXAx1vxk4UpCDTpoKI=
github.com/stackql/go-openapistackql v0.0.6-rc02 h1:vPya2Nqt9kqs6TESdd/gW576PruqYRyGPKLSlfLp5FE=
github.com/stackql/go-openapistackql v0.0.6-rc02/go.mod h1:5yriuoWCp/yd3d7a8ja076QHJrLE9tFkxBkqeuUIfTw=
github.com/stackql/go-openapistackql v0.0.7-alpha01 h1:dtQ1tsOkqAu/pzKQHCi/IqODk290Htf3Mk2ae8DIpf8=
github.com/stackql/go-openapistackql v0.0.7-alpha01/go.mod h1:5yriuoWCp/yd3d7a8ja076QHJrLE9tFkxBkqeuUIfTw=
github.com/stackql/go-openapistackql v0.0.7-beta01 h1:j9sQ/VzDIvd+2LWRsCvKZFWV8zjEb8N9sePwN1kadJM=
github.com/stackql/go-openapistackql v0.0.7-beta01/go.mod h1:eh1rztQzASRLNc4lhGEsPcGQdMUA6N0zzUyQ21djjzY=
github.com/stackql/go-spew v1.1.3-alpha24 h1:yNmgWU+OKU8SvlQ0umiQWWgWS6C5U1GuRMlYfQgbmJA=
github.com/stackql/go-spew v1.1.3-alpha24/go.mod h1:o2MPqg2ee1PN4SxAh9zQSJJmKKFJjpro9pejdK7dXWk=
github.com/stackql/go-sqlite3 v0.0.1-stackqlrc01 h1:q+LfCfPrIqqG5+v9T5xjyYzOEBB4i77Ek10Lzwyd0D4=
github.com/stackql/go-sqlite3 v0.0.1-stackqlrc01/go.mod h1:JHMGM3Hu7TcW8NBiJMFSBCHaUkhm1VjGZD5/uDaUDf4=
github.com/stackql/go-suffix-map v0.0.1-alpha01 h1:TDUDS8bySu41Oo9p0eniUeCm43mnRM6zFEd6j6VUaz8=
github.com/stackql/go-suffix-map v0.0.1-alpha01/go.mod h1:QAi+SKukOyf4dBtWy8UMy+hsXXV+yyEE4vmBkji2V7g=
github.com/stackql/psql-wire v0.0.1-stackqlrc01 h1:oYm8EuiABpn9BHddYMSru8LCPaefQbOPiIYIlVb8mCc=
github.com/stackql/psql-wire v0.0.1-stackqlrc01/go.mod h1:p4SxaTS4m9mLiq08GSOaatXSiai8REL5XPMlcVJxSwE=
github.com/stackql/psql-wire v0.0.2-stackqlalpha1 h1:3fUDhCixcBsTR42cghu30mQXZbvG5XkD5Ty2eS0P+SQ=
github.com/stackql/psql-wire v0.0.2-stackqlalpha1/go.mod h1:p4SxaTS4m9mLiq08GSOaatXSiai8REL5XPMlcVJxSwE=
github.com/stackql/psql-wire v0.0.2-stackqlalpha2 h1:4+CsuT9J1BC32X+cEYKAt4/tie5abSTudvabuwAf4BE=
github.com/stackql/psql-wire v0.0.2-stackqlalpha2/go.mod h1:p4SxaTS4m9mLiq08GSOaatXSiai8REL5XPMlcVJxSwE=
github.com/stackql/psql-wire v0.0.2-stackqlalpha3 h1:YKEcJoMpzU16ODCxzcD5Xc6PYmB+VKJhDT4fYO6Wxvs=
github.com/stackql/psql-wire v0.0.2-stackqlalpha3/go.mod h1:p4SxaTS4m9mLiq08GSOaatXSiai8REL5XPMlcVJxSwE=
github.com/stackql/psql-wire v0.0.2-stackqlalpha4 h1:eoQkQFduLXIMXmd/krARPOfPcyUjjxdT7ZplKfkqkeA=
github.com/stackql/psql-wire v0.0.2-stackqlalpha4/go.mod h1:p4SxaTS4m9mLiq08GSOaatXSiai8REL5XPMlcVJxSwE=
github.com/stackql/readline v0.0.1-rc01 h1:E5Sxe8vB/dZzGlJTJuVYKTYL9EHG0xNrepg8vev5YP0=
github.com/stackql/readline v0.0.1-rc01/go.mod h1:GsQot9cgbH0B1/8pwoQKJ3KAAXaE+8BjFD2RvJOGs1Y=
github.com/stackql/stackql-provider-registry v0.0.1-rc01 h1:3XorfaYEhGpuvEeQK04EmpZUCr42hZ/a4Nh3wE25LF0=
github.com/stackql/stackql-provider-registry v0.0.1-rc01/go.mod h1:D0WFWa7HOXS+PQAmvN0Nm1E6dMdUkUFtAzRH8cXxg88=
github.com/stackql/vitess v0.0.11-alpha05 h1:h+FczKcSE6k0tm/O/UyaCzNjzlrHof2FcG1Gzpqq+68=
github.com/stackql/vitess v0.0.11-alpha05/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
github.com/stackql/vitess v0.0.11-alpha07 h1:YWTiJ9thQ0d4p24wkfobHOEsM7Z1NzsHkS8SdCq8NM0=
github.com/stackql/vitess v0.0.11-alpha07/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
github.com/stackql/vitess v0.0.11-alpha08 h1:B0M9djqTnDzmEoI+Pvt6UIxFY3dJVfKqjB7TV9k490E=
github.com/stackql/vitess v0.0.11-alpha08/go.mod h1:6aOZHbgHclTasEGZvrdoWfca6Y4XJfemKMqwnDL/klI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down Expand Up @@ -848,6 +840,7 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
Expand Down
3 changes: 2 additions & 1 deletion internal/stackql/astvisit/astvisit.go
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,8 @@ func (v *DRMAstVisitor) Visit(node sqlparser.SQLNode) error {
}
buf.AstPrintf(node, "%v", node.Name)
buf.AstPrintf(node, `"`)
v.rewrittenQuery = buf.String()
rq := buf.String()
v.rewrittenQuery = rq

case *sqlparser.ParenTableExpr:
buf.AstPrintf(node, "(%v)", node.Exprs)
Expand Down
30 changes: 18 additions & 12 deletions internal/stackql/astvisit/query_rewriting.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@ func (v *QueryRewriteAstVisitor) buildAcquireQueryCtx(
func (v *QueryRewriteAstVisitor) getStarColumns(
tbl *taxonomy.ExtendedTableMetadata,
) ([]openapistackql.ColumnDescriptor, error) {
schema, err := tbl.GetResponseSchema()
schema, _, err := tbl.GetResponseSchemaAndMediaType()
if err != nil {
return nil, err
}
itemObjS, selectItemsKey, err := tbl.GetSelectSchemaAndObjectPath()
tbl.SelectItemsKey = selectItemsKey
unsuitableSchemaMsg := "schema unsuitable for select query"
log.Infoln(fmt.Sprintf("schema.Items = %v", schema.Items))
log.Infoln(fmt.Sprintf("schema.Properties = %v", schema.Properties))
var itemObjS *openapistackql.Schema
itemObjS, tbl.SelectItemsKey, err = schema.GetSelectSchema(tbl.LookupSelectItemsKey())
if err != nil {
return nil, fmt.Errorf(unsuitableSchemaMsg)
}
Expand Down Expand Up @@ -117,11 +115,20 @@ func (v *QueryRewriteAstVisitor) GenerateSelectDML() (*drm.PreparedStatementCtx,
var wq strings.Builder
var controlWhereComparisons []string
for _, v := range v.tableSlice {
gIDcn := fmt.Sprintf(`"%s"."%s"`, v.GetUniqueId(), genIdColName)
sIDcn := fmt.Sprintf(`"%s"."%s"`, v.GetUniqueId(), sessionIDColName)
tIDcn := fmt.Sprintf(`"%s"."%s"`, v.GetUniqueId(), txnIdColName)
iIDcn := fmt.Sprintf(`"%s"."%s"`, v.GetUniqueId(), insIdColName)
controlWhereComparisons = append(controlWhereComparisons, fmt.Sprintf(`%s = ? AND %s = ? AND %s = ? AND %s = ?`, gIDcn, sIDcn, tIDcn, iIDcn))
alias := v.Alias
if alias != "" {
gIDcn := fmt.Sprintf(`"%s"."%s"`, alias, genIdColName)
sIDcn := fmt.Sprintf(`"%s"."%s"`, alias, sessionIDColName)
tIDcn := fmt.Sprintf(`"%s"."%s"`, alias, txnIdColName)
iIDcn := fmt.Sprintf(`"%s"."%s"`, alias, insIdColName)
controlWhereComparisons = append(controlWhereComparisons, fmt.Sprintf(`%s = ? AND %s = ? AND %s = ? AND %s = ?`, gIDcn, sIDcn, tIDcn, iIDcn))
} else {
gIDcn := fmt.Sprintf(`"%s"`, genIdColName)
sIDcn := fmt.Sprintf(`"%s"`, sessionIDColName)
tIDcn := fmt.Sprintf(`"%s"`, txnIdColName)
iIDcn := fmt.Sprintf(`"%s"`, insIdColName)
controlWhereComparisons = append(controlWhereComparisons, fmt.Sprintf(`%s = ? AND %s = ? AND %s = ? AND %s = ?`, gIDcn, sIDcn, tIDcn, iIDcn))
}
}
controlWhereSubClause := fmt.Sprintf("( %s )", strings.Join(controlWhereComparisons, " AND "))
wq.WriteString(controlWhereSubClause)
Expand All @@ -142,7 +149,6 @@ func (v *QueryRewriteAstVisitor) GenerateSelectDML() (*drm.PreparedStatementCtx,
q.WriteString(selectSuffix)

query := q.String()

return drm.NewPreparedStatementCtx(
query,
"",
Expand Down Expand Up @@ -592,7 +598,7 @@ func (v *QueryRewriteAstVisitor) Visit(node sqlparser.SQLNode) error {
if err != nil {
return err
}
schema, err := tbl.GetResponseSchema()
schema, _, err := tbl.GetResponseSchemaAndMediaType()
if err != nil {
return err
}
Expand Down
26 changes: 8 additions & 18 deletions internal/stackql/astvisit/table_name_substitution.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,17 @@ func (v *TableNameSubstitutionAstVisitor) addAcquireQuery(
func (v *TableNameSubstitutionAstVisitor) getStarColumns(
tbl *taxonomy.ExtendedTableMetadata,
) ([]openapistackql.ColumnDescriptor, error) {
schema, err := tbl.GetResponseSchema()
schema, _, err := tbl.GetResponseSchemaAndMediaType()
if err != nil {
return nil, err
}
itemObjS, selectItemsKey, err := tbl.GetSelectSchemaAndObjectPath()
// rscStr, _ := tbl.GetResourceStr()
unsuitableSchemaMsg := "schema unsuitable for select query"
// log.Infoln(fmt.Sprintf("schema.ID = %v", schema.ID))
log.Infoln(fmt.Sprintf("schema.Items = %v", schema.Items))
log.Infoln(fmt.Sprintf("schema.Properties = %v", schema.Properties))
var itemObjS *openapistackql.Schema
itemObjS, tbl.SelectItemsKey, err = schema.GetSelectSchema(tbl.LookupSelectItemsKey())
if err != nil {
return nil, fmt.Errorf(unsuitableSchemaMsg)
}
tbl.SelectItemsKey = selectItemsKey
if itemObjS == nil {
return nil, fmt.Errorf(unsuitableSchemaMsg)
}
Expand All @@ -99,22 +96,15 @@ func (v *TableNameSubstitutionAstVisitor) buildSelectQuery(
cols []parserutil.ColumnHandle,
dc drm.DRMConfig,
) error {
schema, err := tbl.GetResponseSchema()
if err != nil {
return err
}
provStr, _ := tbl.GetProviderStr()
svcStr, _ := tbl.GetServiceStr()
itemObjS, selectItemsKey, err := tbl.GetSelectSchemaAndObjectPath()
// rscStr, _ := tbl.GetResourceStr()
unsuitableSchemaMsg := "schema unsuitable for select query"
// log.Infoln(fmt.Sprintf("schema.ID = %v", schema.ID))
log.Infoln(fmt.Sprintf("schema.Items = %v", schema.Items))
log.Infoln(fmt.Sprintf("schema.Properties = %v", schema.Properties))
var itemObjS *openapistackql.Schema
itemObjS, tbl.SelectItemsKey, err = schema.GetSelectSchema(tbl.LookupSelectItemsKey())
if err != nil {
return fmt.Errorf(unsuitableSchemaMsg)
}
tbl.SelectItemsKey = selectItemsKey
provStr, _ := tbl.GetProviderStr()
svcStr, _ := tbl.GetServiceStr()
if itemObjS == nil {
return fmt.Errorf(unsuitableSchemaMsg)
}
Expand Down Expand Up @@ -564,7 +554,7 @@ func (v *TableNameSubstitutionAstVisitor) Visit(node sqlparser.SQLNode) error {
if !ok {
return fmt.Errorf("could not locate table for expr '%v'", node)
}
schema, err := tbl.GetResponseSchema()
schema, _, err := tbl.GetResponseSchemaAndMediaType()
if err != nil {
return err
}
Expand Down
Loading