From 4e091ae95aab2118789aeeca796acac520dfd371 Mon Sep 17 00:00:00 2001 From: Kenneth Shaw Date: Wed, 3 Jan 2024 20:51:20 +0700 Subject: [PATCH] Renamed genji -> chai, updated driver package paths, dependency updates --- LICENSE | 2 +- README.md | 12 ++++------ drivers/chai/chai.go | 13 ++++++++++ drivers/databend/databend.go | 4 ++-- drivers/genji/genji.go | 14 ----------- go.mod | 22 ++++++++--------- go.sum | 46 +++++++++++++++++++----------------- internal/chai.go | 9 +++++++ internal/genji.go | 9 ------- internal/internal.go | 4 ++-- text/license.go | 2 +- 11 files changed, 68 insertions(+), 69 deletions(-) create mode 100644 drivers/chai/chai.go delete mode 100644 drivers/genji/genji.go create mode 100644 internal/chai.go delete mode 100644 internal/genji.go diff --git a/LICENSE b/LICENSE index 8f7419d5574..9c3985ece51 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2023 Kenneth Shaw +Copyright (c) 2016-2024 Kenneth Shaw Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index fc59d89b8d5..a0df73a1e64 100644 --- a/README.md +++ b/README.md @@ -214,9 +214,8 @@ The following are the [Go SQL drivers][go-sql] that `usql` supports, the associated database, scheme / build tag, and scheme aliases: - | Database | Scheme / Tag | Scheme Aliases | Driver Package / Notes | -| -------------------- | --------------- | ----------------------------------------------- | --------------------------------------------------------------------------- | +|----------------------|-----------------|-------------------------------------------------|-----------------------------------------------------------------------------| | PostgreSQL | `postgres` | `pg`, `pgsql`, `postgresql` | [github.com/lib/pq][d-postgres] | | MySQL | `mysql` | `my`, `maria`, `aurora`, `mariadb`, `percona` | [github.com/go-sql-driver/mysql][d-mysql] | | Microsoft SQL Server | `sqlserver` | `ms`, `mssql`, `azuresql` | [github.com/microsoft/go-mssqldb][d-sqlserver] | @@ -234,9 +233,10 @@ associated database, scheme / build tag, and scheme aliases: | AWS Athena | `athena` | `s3`, `aws`, `awsathena` | [github.com/uber/athenadriver/go][d-athena] | | Azure CosmosDB | `cosmos` | `cm` | [github.com/btnguyen2k/gocosmos][d-cosmos] | | Cassandra | `cassandra` | `ca`, `scy`, `scylla`, `datastax`, `cql` | [github.com/MichaelS11/go-cql-driver][d-cassandra] | +| ChaiSQL | `chai` | `ci`, `genji`, `chaisql` | [github.com/chaisql/chai/driver][d-chai] | | Couchbase | `couchbase` | `n1`, `n1ql` | [github.com/couchbase/go_n1ql][d-couchbase] | | Cznic QL | `ql` | `cznic`, `cznicql` | [modernc.org/ql][d-ql] | -| Databend | `databend` | `dd`, `bend` | [github.com/databendcloud/databend-go][d-databend] | +| Databend | `databend` | `dd`, `bend` | [github.com/datafuselabs/databend-go][d-databend] | | Databricks | `databricks` | `br`, `brick`, `bricks`, `databrick` | [github.com/databricks/databricks-sql-go][d-databricks] | | DuckDB | `duckdb` | `dk`, `ddb`, `duck`, `file` | [github.com/marcboeker/go-duckdb][d-duckdb] [†][f-cgo] | | DynamoDb | `dynamodb` | `dy`, `dyn`, `dynamo`, `dynamodb` | [github.com/btnguyen2k/godynamo][d-dynamodb] | @@ -270,7 +270,6 @@ associated database, scheme / build tag, and scheme aliases: | Vitess Database | `mysql` | `vt`, `vitess` | [github.com/go-sql-driver/mysql][d-mysql] [‡][f-wire] | | | | | | | Apache Impala | `impala` | `im` | [github.com/bippio/go-impala][d-impala] | -| Genji | `genji` | `gj` | [github.com/genjidb/genji/driver][d-genji] | | | | | | | **NO DRIVERS** | `no_base` | | _no base drivers (useful for development)_ | | **MOST DRIVERS** | `most` | | _all stable drivers_ | @@ -283,18 +282,18 @@ associated database, scheme / build tag, and scheme aliases: [d-avatica]: https://github.com/apache/calcite-avatica-go [d-bigquery]: https://github.com/go-gorm/bigquery [d-cassandra]: https://github.com/MichaelS11/go-cql-driver +[d-chai]: https://github.com/chaisql/chai [d-clickhouse]: https://github.com/ClickHouse/clickhouse-go [d-cosmos]: https://github.com/btnguyen2k/gocosmos [d-couchbase]: https://github.com/couchbase/go_n1ql [d-csvq]: https://github.com/mithrandie/csvq-driver -[d-databend]: https://github.com/databendcloud/databend-go +[d-databend]: https://github.com/datafuselabs/databend-go [d-databricks]: https://github.com/databricks/databricks-sql-go [d-duckdb]: https://github.com/marcboeker/go-duckdb [d-dynamodb]: https://github.com/btnguyen2k/godynamo [d-exasol]: https://github.com/exasol/exasol-driver-go [d-firebird]: https://github.com/nakagami/firebirdsql [d-flightsql]: https://github.com/apache/arrow/tree/main/go/arrow/flight/flightsql/driver -[d-genji]: https://github.com/genjidb/genji [d-godror]: https://github.com/godror/godror [d-h2]: https://github.com/jmrobles/h2go [d-hive]: https://github.com/sql-machine-learning/gohive @@ -322,7 +321,6 @@ associated database, scheme / build tag, and scheme aliases: [d-vertica]: https://github.com/vertica/vertica-sql-go [d-voltdb]: https://github.com/VoltDB/voltdb-client-go [d-ydb]: https://github.com/ydb-platform/ydb-go-sdk - [f-cgo]: #f-cgo "Requires CGO" diff --git a/drivers/chai/chai.go b/drivers/chai/chai.go new file mode 100644 index 00000000000..cf35e9bc86e --- /dev/null +++ b/drivers/chai/chai.go @@ -0,0 +1,13 @@ +// Package chai defines and registers usql's ChaiSQL driver. +// +// See: https://github.com/chaisql/chai +package chai + +import ( + _ "github.com/chaisql/chai/driver" // DRIVER + "github.com/xo/usql/drivers" +) + +func init() { + drivers.Register("chai", drivers.Driver{}) +} diff --git a/drivers/databend/databend.go b/drivers/databend/databend.go index f5437fc3570..18998529826 100644 --- a/drivers/databend/databend.go +++ b/drivers/databend/databend.go @@ -1,12 +1,12 @@ // Package databend defines and registers usql's Databend driver. // -// See: https://github.com/databendcloud/databend-go +// See: https://github.com/datafuselabs/databend-go package databend import ( "io" - _ "github.com/databendcloud/databend-go" // DRIVER + _ "github.com/datafuselabs/databend-go" // DRIVER "github.com/xo/usql/drivers" "github.com/xo/usql/drivers/metadata" infos "github.com/xo/usql/drivers/metadata/informationschema" diff --git a/drivers/genji/genji.go b/drivers/genji/genji.go deleted file mode 100644 index af9cc352222..00000000000 --- a/drivers/genji/genji.go +++ /dev/null @@ -1,14 +0,0 @@ -// Package genji defines and registers usql's Genji driver. -// -// Group: bad -// See: https://github.com/genjidb/genji -package genji - -import ( - _ "github.com/genjidb/genji/driver" // DRIVER - "github.com/xo/usql/drivers" -) - -func init() { - drivers.Register("genji", drivers.Driver{}) -} diff --git a/go.mod b/go.mod index 7325dc71919..78a7a0c4e67 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/ClickHouse/clickhouse-go/v2 v2.17.1 github.com/IBM/nzgo/v12 v12.0.8 github.com/MichaelS11/go-cql-driver v0.1.1 - github.com/SAP/go-hdb v1.6.8 + github.com/SAP/go-hdb v1.7.0 github.com/VoltDB/voltdb-client-go v1.0.15 github.com/alecthomas/chroma/v2 v2.12.0 github.com/alecthomas/kingpin/v2 v2.4.0 @@ -17,13 +17,13 @@ require ( github.com/apache/calcite-avatica-go/v5 v5.3.0 github.com/bippio/go-impala v2.1.0+incompatible github.com/btnguyen2k/gocosmos v1.0.0 - github.com/btnguyen2k/godynamo v1.0.0 + github.com/btnguyen2k/godynamo v1.1.1 + github.com/chaisql/chai v0.16.0 github.com/couchbase/go_n1ql v0.0.0-20220303011133-0ed4bf93e31d - github.com/databendcloud/databend-go v0.4.6 github.com/databricks/databricks-sql-go v1.5.2 + github.com/datafuselabs/databend-go v0.5.0 github.com/docker/docker v24.0.7+incompatible github.com/exasol/exasol-driver-go v1.0.4 - github.com/genjidb/genji v0.15.2 github.com/go-sql-driver/mysql v1.7.1 github.com/gocql/gocql v1.6.0 github.com/godror/godror v0.41.0 @@ -46,13 +46,13 @@ require ( github.com/nakagami/firebirdsql v0.9.6 github.com/ory/dockertest/v3 v3.10.0 github.com/prestodb/presto-go-client v0.0.0-20230524183650-a1a0bac0f63e - github.com/sijms/go-ora/v2 v2.8.3 + github.com/sijms/go-ora/v2 v2.8.4 github.com/snowflakedb/gosnowflake v1.7.1 github.com/thda/tds v0.1.7 github.com/trinodb/trino-go-client v0.313.0 github.com/uber/athenadriver v1.1.14 github.com/vertica/vertica-sql-go v1.3.3 - github.com/xo/dburl v0.20.0 + github.com/xo/dburl v0.20.1 github.com/xo/tblfmt v0.10.3 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e github.com/ydb-platform/ydb-go-sdk/v3 v3.54.3 @@ -119,6 +119,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bitfield/gotestdox v0.2.2 // indirect github.com/btnguyen2k/consu/checksum v1.1.0 // indirect + github.com/btnguyen2k/consu/g18 v0.0.2 // indirect github.com/btnguyen2k/consu/gjrc v0.2.1 // indirect github.com/btnguyen2k/consu/olaf v0.1.3 // indirect github.com/btnguyen2k/consu/reddo v0.1.8 // indirect @@ -129,11 +130,10 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect - github.com/cockroachdb/errors v1.10.0 // indirect + github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect - github.com/cockroachdb/pebble v0.0.0-20230718183418-628c4107d05a // indirect + github.com/cockroachdb/pebble v1.0.0 // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 // indirect github.com/containerd/containerd v1.7.7 // indirect github.com/containerd/continuity v0.4.2 // indirect github.com/coreos/go-oidc/v3 v3.9.0 // indirect @@ -161,7 +161,7 @@ require ( github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/getsentry/sentry-go v0.22.0 // indirect + github.com/getsentry/sentry-go v0.25.0 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.7.1 // indirect github.com/go-jose/go-jose/v3 v3.0.1 // indirect @@ -176,6 +176,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect github.com/golang-jwt/jwt/v5 v5.2.0 // indirect + github.com/golang-module/carbon/v2 v2.2.14 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -228,7 +229,6 @@ require ( github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect - github.com/minio/sio v0.3.1 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mithrandie/go-file/v2 v2.1.0 // indirect diff --git a/go.sum b/go.sum index d93c99ea1f9..3b0b48ffae8 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,8 @@ github.com/Microsoft/hcsshim v0.11.1/go.mod h1:nFJmaO4Zr5Y7eADdFOpYswDDlNVbvcIJJ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/SAP/go-hdb v1.6.8 h1:fM/Qb82mwQjrC0rnZhdGFFZLk1r2Qraz+RQGv7vfg80= -github.com/SAP/go-hdb v1.6.8/go.mod h1:2AbZThZ9oOgUgWY5NkCW1RJH8+szzpOsScBp+bBujl8= +github.com/SAP/go-hdb v1.7.0 h1:w6vRj1cfybV0vd2D9MBYNXhSWjY9oeb79KA1/w94CxQ= +github.com/SAP/go-hdb v1.7.0/go.mod h1:2AbZThZ9oOgUgWY5NkCW1RJH8+szzpOsScBp+bBujl8= github.com/UNO-SOFT/zlog v0.8.1 h1:TEFkGJHtUfTRgMkLZiAjLSHALjwSBdw6/zByMC5GJt4= github.com/UNO-SOFT/zlog v0.8.1/go.mod h1:yqFOjn3OhvJ4j7ArJqQNA+9V+u6t9zSAyIZdWdMweWc= github.com/VoltDB/voltdb-client-go v1.0.15 h1:G7rZxKiemYkaYZLoLamhRnAOGyq5wlyqPefCAAflB/0= @@ -350,6 +350,8 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4Yn github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/btnguyen2k/consu/checksum v1.1.0 h1:1Sqa48s9WJsejwmVUfmSsSBG0z7sPfgSQa8atKCiMqY= github.com/btnguyen2k/consu/checksum v1.1.0/go.mod h1:/zZ8EXdphDYEkBFua51hK9y3rODCPIkiZYnCDlHT670= +github.com/btnguyen2k/consu/g18 v0.0.2 h1:HzP10nyoSotdaie4orKT/Sgq+rHFSouRwGtJvzRKna4= +github.com/btnguyen2k/consu/g18 v0.0.2/go.mod h1:gTPcr87XdCLDISusRQyDey22/ZOw6bLh6EChxTLx6/c= github.com/btnguyen2k/consu/gjrc v0.2.1 h1:RUgbgs1NDpuUDfY7PSyva8AShyui+ds1MOzmi2k0SfM= github.com/btnguyen2k/consu/gjrc v0.2.1/go.mod h1:+aPcD9tY5x8gHH5+RdCqBDvEO4hw4kXruUz+lBG01QI= github.com/btnguyen2k/consu/olaf v0.1.3 h1:0dWWmN5nOB/9pJdo7o1S3wR2+l3kG7pXHv3Vwki8uNM= @@ -364,8 +366,8 @@ github.com/btnguyen2k/consu/semita v0.1.5 h1:fu71xNJTbCV8T+6QPJdJu3bxtmLWvTjCepk github.com/btnguyen2k/consu/semita v0.1.5/go.mod h1:fksCe3L4kxiJVnKKhUXKI8mcFdB9974mtedwUVVFu1M= github.com/btnguyen2k/gocosmos v1.0.0 h1:+HLB/aW/6qhVQfAe6Mk7bE/RuNbV//ewp1zjoVWR/Qg= github.com/btnguyen2k/gocosmos v1.0.0/go.mod h1:08zhDI+A87m6B59d3TneP3md9+EVhdF1CARXuSt5yCU= -github.com/btnguyen2k/godynamo v1.0.0 h1:T7Jq5r5arktaYDzhtVL9Z86caLe0CnGUSzHTMZCDVgY= -github.com/btnguyen2k/godynamo v1.0.0/go.mod h1:7GklIuWYuVFNs8KIFHC3HSzQJpHHjWXrY+NAZCllq/M= +github.com/btnguyen2k/godynamo v1.1.1 h1:GGtokdp+SIFkyFNN8jxzSyLPXfwpCq8nECoccZZXdpg= +github.com/btnguyen2k/godynamo v1.1.1/go.mod h1:Qhtk3p86V+dyPkmqiCKaz8+aFG0gGPrGEbgAiIh6ZaA= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI= @@ -379,6 +381,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chaisql/chai v0.16.0 h1:UVvVOcf9H/OfSNRAzH9j1TuJnetUGGqV6gaAXZ8mrjQ= +github.com/chaisql/chai v0.16.0/go.mod h1:DYGursaN0/64vw3puP+ICq/sYr+TfdbKo9jmRax6J3Q= github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -401,18 +405,16 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= -github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+0VUU= -github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877 h1:1MLK4YpFtIEo3ZtMA5C795Wtv5VuUnrXX7mQG+aHg6o= +github.com/cockroachdb/datadriven v1.0.3-0.20230801171734-e384cf455877/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= +github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230718183418-628c4107d05a h1:i6xm42ImQ7wEqCJKrdasK7QXiV8kc6IP2R2hfylniHU= -github.com/cockroachdb/pebble v0.0.0-20230718183418-628c4107d05a/go.mod h1:FN5O47SBEz5+kO9fG8UTR64g2WS1u5ZFCgTvxGjoSks= +github.com/cockroachdb/pebble v1.0.0 h1:WZWlV/s78glZbY2ylUITDOWSVBD3cLjcWPLRPFbHNYg= +github.com/cockroachdb/pebble v1.0.0/go.mod h1:bynZ3gvVyhlvjLI7PT6dmZ7g76xzJ7HpxfjgkzCGz6s= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6 h1:DJK8W/iB+s/qkTtmXSrHA49lp5O3OsR7E6z4byOLy34= -github.com/cockroachdb/tokenbucket v0.0.0-20230613231145-182959a1fad6/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= github.com/containerd/containerd v1.7.7/go.mod h1:3c4XZv6VeT9qgf9GMTxNTMFxGJrGpI2vz1yk4ye+YY8= @@ -440,10 +442,10 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs= github.com/danieljoos/wincred v1.2.1/go.mod h1:uGaFL9fDn3OLTvzCGulzE+SzjEe5NGlh5FdCcyfPwps= -github.com/databendcloud/databend-go v0.4.6 h1:WeSXOwtwkYGVtPvDQwwTra9EZi55xICRKf0I2bDW6ss= -github.com/databendcloud/databend-go v0.4.6/go.mod h1:gc59O5283qi8NyzAJ1le0SEZb5p/SL7nwvrB9p6lxDw= github.com/databricks/databricks-sql-go v1.5.2 h1:y7dpPiaZTr2+rDbo72jXjyQjU0uB9rJfXolyKzg96b4= github.com/databricks/databricks-sql-go v1.5.2/go.mod h1:8aNP4vhhfBJZhc4n7LcSAvtJsZ+Dc25Q6mGxM1/8WaY= +github.com/datafuselabs/databend-go v0.5.0 h1:txw6NlxB8szjwsbQbfv3hd27JEgkU8trEINYJrDD3E8= +github.com/datafuselabs/databend-go v0.5.0/go.mod h1:4UZVMHoTgkdzfnVKWpIFf4UdnnTJ586tBaIeJpXxSNA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -512,10 +514,8 @@ github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc/go.mod h1:/kOrWrZ github.com/fyne-io/mobile v0.1.2/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY= github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= -github.com/genjidb/genji v0.15.2 h1:5cPRZPvBkLrG+auuCdkiWSg848mz4gVNCZ9gD/ig7lo= -github.com/genjidb/genji v0.15.2/go.mod h1:cyZtbarUfeyJcywXhuP9kf3HfUqEwl8lv1MsUQl+nWo= -github.com/getsentry/sentry-go v0.22.0 h1:XNX9zKbv7baSEI65l+H1GEJgSeIC1c7EN5kluWaP6dM= -github.com/getsentry/sentry-go v0.22.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= +github.com/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= +github.com/getsentry/sentry-go v0.25.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= @@ -568,6 +568,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOW github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw= github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= +github.com/golang-module/carbon/v2 v2.2.14 h1:mT2hpNoCQVnkboZ6iyRf7WCbXtZTRXFBvXXWMp0PaMc= +github.com/golang-module/carbon/v2 v2.2.14/go.mod h1:XDALX7KgqmHk95xyLeaqX9/LJGbfLATyruTziq68SZ8= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= @@ -871,8 +873,6 @@ github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpsp github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= -github.com/minio/sio v0.3.1 h1:d59r5RTHb1OsQaSl1EaTWurzMMDRLA5fgNmjzD4eVu4= -github.com/minio/sio v0.3.1/go.mod h1:S0ovgVgc+sTlQyhiXA1ppBLv7REM7TYi5yyq2qL/Y6o= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -980,8 +980,8 @@ github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9Nz github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sijms/go-ora/v2 v2.8.3 h1:x4BHXCQUg6KpVE4H8hzC3fRNN8hwDKRIlhqWy/oInGA= -github.com/sijms/go-ora/v2 v2.8.3/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= +github.com/sijms/go-ora/v2 v2.8.4 h1:6VmkqKg/8bELn+k3mr2wI9+inJEiNhNx1p2IOrnx7T4= +github.com/sijms/go-ora/v2 v2.8.4/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -1053,6 +1053,8 @@ github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8 github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xo/dburl v0.20.0 h1:v601OhM9J4Zh56R270ncM9HRgoxp39tf9+nt5ft9UD0= github.com/xo/dburl v0.20.0/go.mod h1:B7/G9FGungw6ighV8xJNwWYQPMfn3gsi2sn5SE8Bzco= +github.com/xo/dburl v0.20.1 h1:YEhpSpMmIDvzH0ACoFJ5mVYBQ7701TRx9rsknyal1Nk= +github.com/xo/dburl v0.20.1/go.mod h1:B7/G9FGungw6ighV8xJNwWYQPMfn3gsi2sn5SE8Bzco= github.com/xo/tblfmt v0.0.0-20190609041254-28c54ec42ce8/go.mod h1:3U5kKQdIhwACye7ml3acccHmjGExY9WmUGU7rnDWgv0= github.com/xo/tblfmt v0.10.3 h1:Fb2Le5wvzBjOwA/KFRpP5bZo+iR9cZnzSAN3tULoUPI= github.com/xo/tblfmt v0.10.3/go.mod h1:W6oqhxtqDOEMkrS2GPO0zmcww7ozM2E6BRv3kNfXd24= diff --git a/internal/chai.go b/internal/chai.go new file mode 100644 index 00000000000..e4046188c52 --- /dev/null +++ b/internal/chai.go @@ -0,0 +1,9 @@ +//go:build (all || most || chai) && !no_chai + +package internal + +// Code generated by gen.go. DO NOT EDIT. + +import ( + _ "github.com/xo/usql/drivers/chai" // ChaiSQL driver +) diff --git a/internal/genji.go b/internal/genji.go deleted file mode 100644 index 6ca29185ea9..00000000000 --- a/internal/genji.go +++ /dev/null @@ -1,9 +0,0 @@ -//go:build (bad || genji) && !no_genji - -package internal - -// Code generated by gen.go. DO NOT EDIT. - -import ( - _ "github.com/xo/usql/drivers/genji" // Genji driver -) diff --git a/internal/internal.go b/internal/internal.go index 843a9a9ccf4..db3cfc9aef6 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -13,18 +13,18 @@ func KnownBuildTags() map[string]string { "avatica": "avatica", // github.com/apache/calcite-avatica-go/v5 "bigquery": "bigquery", // gorm.io/driver/bigquery/driver "cassandra": "cql", // github.com/MichaelS11/go-cql-driver + "chai": "chai", // github.com/chaisql/chai/driver "clickhouse": "clickhouse", // github.com/ClickHouse/clickhouse-go/v2 "cosmos": "cosmos", // github.com/btnguyen2k/gocosmos "couchbase": "n1ql", // github.com/couchbase/go_n1ql "csvq": "csvq", // github.com/mithrandie/csvq-driver - "databend": "databend", // github.com/databendcloud/databend-go + "databend": "databend", // github.com/datafuselabs/databend-go "databricks": "databricks", // github.com/databricks/databricks-sql-go "duckdb": "duckdb", // github.com/marcboeker/go-duckdb "dynamodb": "dynamodb", // github.com/btnguyen2k/godynamo "exasol": "exasol", // github.com/exasol/exasol-driver-go "firebird": "firebirdsql", // github.com/nakagami/firebirdsql "flightsql": "flightsql", // github.com/apache/arrow/go/v12/arrow/flight/flightsql/driver - "genji": "genji", // github.com/genjidb/genji/driver "godror": "godror", // github.com/godror/godror "h2": "h2", // github.com/jmrobles/h2go "hive": "hive", // sqlflow.org/gohive diff --git a/text/license.go b/text/license.go index b412d3bed3b..b0c6c2ba704 100644 --- a/text/license.go +++ b/text/license.go @@ -5,7 +5,7 @@ package text // License contains the license text for usql. const License = `The MIT License (MIT) -Copyright (c) 2016-2023 Kenneth Shaw +Copyright (c) 2016-2024 Kenneth Shaw Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal