Some fixes for couchbase

Author: kenshaw

contrib/couchbase/usql-config

@@ -1,2 +1,3 @@
-DB="couchbase://localhost:8093"
-VSQL="select version() as version;"
+# NOTE: this will only work after setting up a database on http://localhost:8091/
+DB="couchbase://Administrator:P4ssw0rd@localhost"
+VSQL="select raw ds_version() as version;"

contrib/usqlpass

@@ -6,6 +6,7 @@ postgres:*:*:*:postgres:P4ssw0rd
 
 cql:*:*:*:cassandra:cassandra
 clickhouse:*:*:*:clickhouse:P4ssw0rd
+couchbase:*:*:*:Administrator:P4ssw0rd
 godror:*:*:*:system:P4ssw0rd
 ignite:*:*:*:ignite:ignite
 mymysql:*:*:*:root:P4ssw0rd

drivers/couchbase/couchbase.go

@@ -4,6 +4,8 @@
 package couchbase
 
 import (
+	"context"
+	"strconv"
 	"strings"
 
 	_ "github.com/couchbase/go_n1ql" // DRIVER: n1ql
@@ -13,6 +15,27 @@ import (
 func init() {
 	drivers.Register("n1ql", drivers.Driver{
 		AllowMultilineComments: true,
+		Version: func(ctx context.Context, db drivers.DB) (string, error) {
+			ver := "<unknown>"
+			/*
+				var buf []byte
+				if err := db.QueryRowContext(ctx, `SELECT ds_version() AS version`).Scan(&buf); err == nil {
+					var m map[string]string
+					if err := json.Unmarshal(buf, &m); err == nil {
+						if s, ok := m["version"]; ok {
+							ver = s
+						}
+					}
+				}
+			*/
+			var v string
+			if err := db.QueryRowContext(ctx, `SELECT RAW ds_version()`).Scan(&v); err == nil {
+				if s, err := strconv.Unquote(v); err == nil {
+					ver = s
+				}
+			}
+			return "Couchbase " + ver, nil
+		},
 		Err: func(err error) (string, string) {
 			return "", strings.TrimPrefix(err.Error(), "N1QL: ")
 		},

go.mod

@@ -55,7 +55,7 @@ require (
 	github.com/trinodb/trino-go-client v0.313.0
 	github.com/uber/athenadriver v1.1.15
 	github.com/vertica/vertica-sql-go v1.3.3
-	github.com/xo/dburl v0.21.1
+	github.com/xo/dburl v0.22.0
 	github.com/xo/tblfmt v0.12.0
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.57.4

go.sum

@@ -1005,8 +1005,8 @@ github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc=
 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU=
-github.com/xo/dburl v0.21.1 h1:n5mfH1fh51RQbvuaKKykGslodt8pZqyZJMNohVo2zK0=
-github.com/xo/dburl v0.21.1/go.mod h1:B7/G9FGungw6ighV8xJNwWYQPMfn3gsi2sn5SE8Bzco=
+github.com/xo/dburl v0.22.0 h1:sO5WLm2ywMzyiLxEcLBlw5AyKvdR5hirq9U7s3fCoeM=
+github.com/xo/dburl v0.22.0/go.mod h1:B7/G9FGungw6ighV8xJNwWYQPMfn3gsi2sn5SE8Bzco=
 github.com/xo/tblfmt v0.0.0-20190609041254-28c54ec42ce8/go.mod h1:3U5kKQdIhwACye7ml3acccHmjGExY9WmUGU7rnDWgv0=
 github.com/xo/tblfmt v0.12.0 h1:3nQGkyGiqzy+H9bcERrqmiK2pSpQKkjn/f5D8oeXSqI=
 github.com/xo/tblfmt v0.12.0/go.mod h1:AKivZTttxEXXrztqGl0dGVh4hsEOSGIfSZNbRhnKZuo=