Skip to content

Commit 5f5ac45

Browse files
haaawkhaaawk
committed
Signal to the shell when using schema db
Signed-off-by: Piotr Jastrzebski <piotr@chiselstrike.com>
1 parent 549079a commit 5f5ac45

3 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ require (
1515
github.com/google/uuid v1.3.0
1616
github.com/hashicorp/go-version v1.6.0
1717
github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
18-
github.com/libsql/libsql-shell-go v0.10.2
18+
github.com/libsql/libsql-shell-go v0.10.4
1919
github.com/manifoldco/promptui v0.9.0
2020
github.com/mitchellh/mapstructure v1.5.0
2121
github.com/olekukonko/tablewriter v0.0.5
2222
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
2323
github.com/spf13/cobra v1.6.1
2424
github.com/spf13/viper v1.15.0
25-
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
26-
golang.org/x/sync v0.3.0
25+
golang.org/x/exp v0.0.0-20240716160929-1d5bc16f04a8
26+
golang.org/x/sync v0.7.0
2727
)
2828

2929
require (
30-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
30+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3131
github.com/atotto/clipboard v0.1.4 // indirect
3232
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
3333
github.com/charmbracelet/lipgloss v0.6.0 // indirect
@@ -57,7 +57,7 @@ require (
5757
github.com/spf13/jwalterweatherman v1.1.0 // indirect
5858
github.com/spf13/pflag v1.0.5 // indirect
5959
github.com/subosito/gotenv v1.4.2 // indirect
60-
github.com/tursodatabase/libsql-client-go v0.0.0-20240715111033-518abad12431 // indirect
60+
github.com/tursodatabase/libsql-client-go v0.0.0-20240716195301-2cfb92c10305 // indirect
6161
golang.org/x/crypto v0.14.0 // indirect
6262
golang.org/x/net v0.17.0 // indirect
6363
golang.org/x/sys v0.13.0 // indirect
@@ -66,5 +66,5 @@ require (
6666
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
6767
gopkg.in/ini.v1 v1.67.0 // indirect
6868
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
nhooyr.io/websocket v1.8.10 // indirect
69+
nhooyr.io/websocket v1.8.11 // indirect
7070
)

‎go.sum‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
4040
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
4141
github.com/Clever/csvlint v0.3.0 h1:58WEFXWy+i0fCbxTXscR2QwYESRuAUFjEGLgZs6j2iU=
4242
github.com/Clever/csvlint v0.3.0/go.mod h1:+wLRuW/bI8NhpRoeyUBxqKsK35OhvgJhXHSWdKp5XJU=
43-
github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI=
44-
github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g=
43+
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
44+
github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
4545
github.com/athoscouto/codename v0.0.3 h1:1SGIW4b97/7fGpyzQ+ughmxBr4sPJQ+7IMV+qs+CRi4=
4646
github.com/athoscouto/codename v0.0.3/go.mod h1:WYA5Vt4+xE7bhaVtjph09iwyjNRqYEGCRkAxdYVsKXc=
4747
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
@@ -140,8 +140,9 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
140140
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
141141
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
142142
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
143-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
144143
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
144+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
145+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
145146
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
146147
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
147148
github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -200,8 +201,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
200201
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
201202
github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
202203
github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
203-
github.com/libsql/libsql-shell-go v0.10.2 h1:aYMvPt/NK0n8GeoyWQSKU347Ls7//Fg14zUB2NEnKsk=
204-
github.com/libsql/libsql-shell-go v0.10.2/go.mod h1:gaZzr9yrmbSB4TX8796CiRYzdR6dF1WfOD6u0xSd718=
204+
github.com/libsql/libsql-shell-go v0.10.4 h1:mAPdzGf+BzTh0fFrg5dBd4/t+67lOnAt1MMmQlrP4XM=
205+
github.com/libsql/libsql-shell-go v0.10.4/go.mod h1:xK+K9v+qxrFFBpQAXJYPbEaYf+5B+suB+MU8GfxTtFo=
205206
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
206207
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
207208
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
@@ -291,8 +292,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
291292
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
292293
github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
293294
github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
294-
github.com/tursodatabase/libsql-client-go v0.0.0-20240715111033-518abad12431 h1:92bBPzYCsSLCvpWHgmKBUHCtqwMX62rxhGxs/QCvQgs=
295-
github.com/tursodatabase/libsql-client-go v0.0.0-20240715111033-518abad12431/go.mod h1:3Y9LlWC05q63NdmViO+2qV22LUjpfYLZWEYfE7ndpmU=
295+
github.com/tursodatabase/libsql-client-go v0.0.0-20240716195301-2cfb92c10305 h1:Kpo+8jx1veYeMWzo8+YKDfS4RSrwCeVrlGq4SwaZjJg=
296+
github.com/tursodatabase/libsql-client-go v0.0.0-20240716195301-2cfb92c10305/go.mod h1:3Y9LlWC05q63NdmViO+2qV22LUjpfYLZWEYfE7ndpmU=
296297
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
297298
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
298299
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -322,8 +323,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
322323
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
323324
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
324325
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
325-
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw=
326-
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ=
326+
golang.org/x/exp v0.0.0-20240716160929-1d5bc16f04a8 h1:Z+vTUQyBb738QmIhbJx3z4htsxDeI+rd0EHvNm8jHkg=
327+
golang.org/x/exp v0.0.0-20240716160929-1d5bc16f04a8/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
327328
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
328329
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
329330
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -399,8 +400,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
399400
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
400401
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
401402
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
402-
golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
403-
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
403+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
404+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
404405
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
405406
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
406407
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -620,8 +621,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
620621
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
621622
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
622623
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
623-
nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q=
624-
nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
624+
nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0=
625+
nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
625626
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
626627
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
627628
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=

‎internal/cmd/db_shell.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ var shellCmd = &cobra.Command{
186186
}
187187

188188
connectionInfo := getConnectionInfo(urlString, db)
189+
schemaDb := false
190+
if db != nil {
191+
schemaDb = db.IsSchema
192+
}
189193

190194
shellConfig := shell.ShellConfig{
191195
DbUri: dbUrl,
@@ -201,6 +205,7 @@ var shellCmd = &cobra.Command{
201205
spinner.Stop()
202206
},
203207
DisableAutoCompletion: true,
208+
SchemaDb: schemaDb,
204209
}
205210

206211
dbID := ""

0 commit comments

Comments
 (0)