Skip to content

Commit 8c24d9a

Browse files
authored
support v3-api in db shell (#1036)
2 parents 7ec6a30 + 8fd79b0 commit 8c24d9a

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

internal/cmd/db_shell.go

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ func tokenFromDb(db *turso.Database, client *turso.Client, claim *turso.Permissi
351351
return token, nil
352352
}
353353

354-
token, err := client.Databases.Token(db.Name, "2d", false, nil, nil)
354+
token, err := generateDbToken(client, db)
355355
if err != nil {
356356
return "", err
357357
}
@@ -362,6 +362,20 @@ func tokenFromDb(db *turso.Database, client *turso.Client, claim *turso.Permissi
362362
return token, nil
363363
}
364364

365+
func generateDbToken(client *turso.Client, db *turso.Database) (string, error) {
366+
if !flags.V3Api() {
367+
return client.Databases.Token(db.Name, "2d", false, nil, nil)
368+
}
369+
orgID, err := tryResolveOrgID(client)
370+
if err != nil {
371+
return "", err
372+
}
373+
if orgID == "" || db.ID == "" {
374+
return client.Databases.Token(db.Name, "2d", false, nil, nil)
375+
}
376+
return client.DatabasesV3.Token(orgID, db.ID, "2d", false, nil)
377+
}
378+
365379
func getConnectionInfo(nameOrUrl string, db *turso.Database) string {
366380
msg := fmt.Sprintf("Connected to %s", internal.Emph(nameOrUrl))
367381
if db != nil && nameOrUrl != "" {

0 commit comments

Comments
 (0)