Skip to content

Commit

Permalink
Renamed genji -> chai, updated driver package paths, dependency updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@kenshaw
kenshaw committed Jan 3, 2024
1 parent dafb149 commit 4e091ae
Show file tree
Hide file tree
Showing 11 changed files with 68 additions and 69 deletions.
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 5 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:

<!-- DRIVER DETAILS START -->

| 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] |
Expand All @@ -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] <sup>[†][f-cgo]</sup> |
| DynamoDb | `dynamodb` | `dy`, `dyn`, `dynamo`, `dynamodb` | [github.com/btnguyen2k/godynamo][d-dynamodb] |
Expand Down Expand Up @@ -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] <sup>[‡][f-wire]</sup> |
| | | | |
| 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_ |
Expand All @@ -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
Expand Down Expand Up @@ -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

<!-- DRIVER DETAILS END -->

[f-cgo]: #f-cgo "Requires CGO"
Expand Down
13 changes: 13 additions & 0 deletions drivers/chai/chai.go
View file
Original file line number Diff line number Diff line change
@@ -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{})
}
4 changes: 2 additions & 2 deletions drivers/databend/databend.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
14 changes: 0 additions & 14 deletions drivers/genji/genji.go
View file

This file was deleted.

22 changes: 11 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading

0 comments on commit 4e091ae

Please sign in to comment.