Merge pull request #60 from Jackson-soft/pgx

change lib/pq to jackc/pgx

Author: lighttiger2505

README.md

@@ -15,7 +15,7 @@ sqls aims to provide advanced intelligence for you to edit sql in your own edito
 ### Support RDBMS
 
 - MySQL([Go-MySQL-Driver](https://github.com/go-sql-driver/mysql))
-- PostgreSQL([pq](https://github.com/lib/pq))
+- PostgreSQL([pgx](https://github.com/jackc/pgx))
 - SQLite3([go-sqlite3](https://github.com/mattn/go-sqlite3))
 
 ### Language Server Features
@@ -57,7 +57,7 @@ sqls aims to provide advanced intelligence for you to edit sql in your own edito
 
 ## Installation
 
-```
+```shell
 go get github.com/lighttiger2505/sqls
 ```
 
@@ -120,7 +120,7 @@ connections:
 
 ### Workspace configuration Sample
 
-* setting example with vim-lsp.
+- setting example with vim-lsp.
 
 ```vim
 if executable('sqls')
@@ -149,7 +149,7 @@ if executable('sqls')
 endif
 ```
 
-* setting example with coc.nvim.
+- setting example with coc.nvim.
 
 In `coc-settings.json` opened by `:CocConfig`
 
@@ -166,7 +166,7 @@ In `coc-settings.json` opened by `:CocConfig`
 }
 ```
 
-* setting example with [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#sqls).
+- setting example with [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig/blob/master/CONFIG.md#sqls).
 
 ```lua
 require'lspconfig'.sqls.setup{
@@ -194,15 +194,15 @@ require'lspconfig'.sqls.setup{
 The first setting in `connections` is the default connection.
 
 | Key         | Description          |
-|-------------|----------------------|
+| ----------- | -------------------- |
 | connections | Database connections |
 
 ### connections
 
 `dataSourceName` takes precedence over the value set in `proto`, `user`, `passwd`, `host`, `port`, `dbName`, `params`.
 
 | Key            | Description                                 |
-|----------------|---------------------------------------------|
+| -------------- | ------------------------------------------- |
 | alias          | Connection alias name. Optional.            |
 | driver         | `mysql`, `postgresql`, `sqlite3`. Required. |
 | dataSourceName | Data source name.                           |
@@ -219,7 +219,7 @@ The first setting in `connections` is the default connection.
 #### sshConfig
 
 | Key        | Description                 |
-|------------|-----------------------------|
+| ---------- | --------------------------- |
 | host       | ssh host. Required.         |
 | port       | ssh port. Required.         |
 | user       | ssh user. Optional.         |
@@ -230,9 +230,9 @@ The first setting in `connections` is the default connection.
 
 See also.
 
-- https://github.com/go-sql-driver/mysql#dsn-data-source-name
-- https://godoc.org/github.com/lib/pq
-- https://github.com/mattn/go-sqlite3#connection-string
+- <https://github.com/go-sql-driver/mysql#dsn-data-source-name>
+- <https://pkg.go.dev/github.com/jackc/pgx/v4>
+- <https://github.com/mattn/go-sqlite3#connection-string>
 
 ## Contributors
 

go.mod

@@ -1,20 +1,16 @@
 module github.com/lighttiger2505/sqls
 
-go 1.13
+go 1.16
 
 require (
-	github.com/go-sql-driver/mysql v1.5.0
-	github.com/google/go-cmp v0.3.1
+	github.com/go-sql-driver/mysql v1.6.0
+	github.com/google/go-cmp v0.5.6
+	github.com/jackc/pgx/v4 v4.12.0
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
-	github.com/k0kubun/pp v3.0.1+incompatible
-	github.com/lib/pq v1.3.0
-	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.9 // indirect
-	github.com/mattn/go-sqlite3 v1.14.1
-	github.com/olekukonko/tablewriter v0.0.4
-	github.com/pkg/errors v0.8.1
-	github.com/sourcegraph/jsonrpc2 v0.0.0-20191222043438-96c4efab7ee2
-	golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
-	gopkg.in/yaml.v2 v2.2.8
+	github.com/k0kubun/pp v2.4.0+incompatible
+	github.com/mattn/go-sqlite3 v1.14.8
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/sourcegraph/jsonrpc2 v0.1.0
+	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -2,12 +2,12 @@ package config
 
 import (
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 
 	"github.com/lighttiger2505/sqls/internal/database"
-	"golang.org/x/xerrors"
 	"gopkg.in/yaml.v2"
 )
 
@@ -64,21 +64,21 @@ func (c *Config) Load(fp string) error {
 
 	file, err := os.OpenFile(fp, os.O_RDONLY, 0666)
 	if err != nil {
-		return xerrors.Errorf("cannot open config, %+v", err)
+		return fmt.Errorf("cannot open config, %w", err)
 	}
 	defer file.Close()
 
 	b, err := ioutil.ReadAll(file)
 	if err != nil {
-		return xerrors.Errorf("cannot read config, %+v", err)
+		return fmt.Errorf("cannot read config, %w", err)
 	}
 
 	if err = yaml.Unmarshal(b, c); err != nil {
-		return xerrors.Errorf("failed unmarshal yaml, %+v", err, string(b))
+		return fmt.Errorf("failed unmarshal yaml, %w, %s", err, string(b))
 	}
 
 	if err := c.Validate(); err != nil {
-		return xerrors.Errorf("failed validation, %+v", err)
+		return fmt.Errorf("failed validation, %w", err)
 	}
 	return nil
 }

internal/config/config.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/lighttiger2505/sqls/dialect"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/xerrors"
 )
 
 type Proto string
@@ -107,19 +106,19 @@ func (s *SSHConfig) Endpoint() string {
 func (s *SSHConfig) ClientConfig() (*ssh.ClientConfig, error) {
 	buffer, err := ioutil.ReadFile(s.PrivateKey)
 	if err != nil {
-		return nil, xerrors.Errorf("cannot read SSH private key file, PrivateKey=%s, %+v", s.PrivateKey, err)
+		return nil, fmt.Errorf("cannot read SSH private key file, PrivateKey=%s, %w", s.PrivateKey, err)
 	}
 
 	var key ssh.Signer
 	if s.PassPhrase != "" {
 		key, err = ssh.ParsePrivateKeyWithPassphrase(buffer, []byte(s.PassPhrase))
 		if err != nil {
-			return nil, xerrors.Errorf("cannot parse SSH private key file with passphrase, PrivateKey=%s, %+v", s.PrivateKey, err)
+			return nil, fmt.Errorf("cannot parse SSH private key file with passphrase, PrivateKey=%s, %w", s.PrivateKey, err)
 		}
 	} else {
 		key, err = ssh.ParsePrivateKey(buffer)
 		if err != nil {
-			return nil, xerrors.Errorf("cannot parse SSH private key file, PrivateKey=%s, %+v", s.PrivateKey, err)
+			return nil, fmt.Errorf("cannot parse SSH private key file, PrivateKey=%s, %w", s.PrivateKey, err)
 		}
 	}
 

internal/database/config.go

@@ -116,7 +116,7 @@ var dummyDatabases = []string{
 	"world",
 }
 var dummyDatabaseTables = map[string][]string{
-	"world": []string{
+	"world": {
 		"city",
 		"country",
 		"countrylanguage",

internal/database/database_mock.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/lighttiger2505/sqls/dialect"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/xerrors"
 )
 
 var driverOpeners = make(map[dialect.DatabaseDriver]Opener)
@@ -59,15 +58,15 @@ func Registered(name dialect.DatabaseDriver) bool {
 func Open(cfg *DBConfig) (*DBConnection, error) {
 	OpenFn, ok := driverOpeners[cfg.Driver]
 	if !ok {
-		return nil, xerrors.Errorf("driver not found, %s", cfg.Driver)
+		return nil, fmt.Errorf("driver not found, %s", cfg.Driver)
 	}
 	return OpenFn(cfg)
 }
 
 func CreateRepository(driver dialect.DatabaseDriver, db *sql.DB) (DBRepository, error) {
 	FactoryFn, ok := driverFactories[driver]
 	if !ok {
-		return nil, xerrors.Errorf("driver not found, %s", driver)
+		return nil, fmt.Errorf("driver not found, %s", driver)
 	}
 	return FactoryFn(db), nil
 }

internal/database/driver.go

@@ -10,7 +10,6 @@ import (
 	"github.com/go-sql-driver/mysql"
 	"github.com/lighttiger2505/sqls/dialect"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/xerrors"
 )
 
 func init() {
@@ -49,7 +48,7 @@ func mysqlOpen(dbConnCfg *DBConfig) (*DBConnection, error) {
 		conn = dbConn
 	}
 	if err := conn.Ping(); err != nil {
-		return nil, xerrors.Errorf("cannot ping to database, %+v", err)
+		return nil, fmt.Errorf("cannot ping to database, %w", err)
 	}
 
 	conn.SetMaxIdleConns(DefaultMaxIdleConns)
@@ -77,12 +76,12 @@ func openMySQLViaSSH(dsn string, sshCfg *SSHConfig) (*sql.DB, *ssh.Client, error
 	}
 	sshConn, err := ssh.Dial("tcp", sshCfg.Endpoint(), sshConfig)
 	if err != nil {
-		return nil, nil, xerrors.Errorf("cannot ssh dial, %+v", err)
+		return nil, nil, fmt.Errorf("cannot ssh dial, %w", err)
 	}
 	mysql.RegisterDialContext("mysql+tcp", (&MySQLViaSSHDialer{sshConn}).Dial)
 	conn, err := sql.Open("mysql", dsn)
 	if err != nil {
-		return nil, nil, xerrors.Errorf("cannot connect database, %+v", err)
+		return nil, nil, fmt.Errorf("cannot connect database, %w", err)
 	}
 	return conn, sshConn, nil
 }
@@ -152,6 +151,7 @@ func (db *MySQLDBRepository) Databases(ctx context.Context) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	databases := []string{}
 	for rows.Next() {
 		var database string
@@ -187,6 +187,7 @@ func (db *MySQLDBRepository) SchemaTables(ctx context.Context) (map[string][]str
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	databaseTables := map[string][]string{}
 	for rows.Next() {
 		var schema, table string
@@ -208,6 +209,7 @@ func (db *MySQLDBRepository) Tables(ctx context.Context) ([]string, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	tables := []string{}
 	for rows.Next() {
 		var table string
@@ -237,6 +239,7 @@ FROM information_schema.COLUMNS
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	tableInfos := []*ColumnDesc{}
 	for rows.Next() {
 		var tableInfo ColumnDesc
@@ -277,6 +280,7 @@ WHERE information_schema.COLUMNS.TABLE_SCHEMA = ?
 	if err != nil {
 		return nil, err
 	}
+	defer rows.Close()
 	tableInfos := []*ColumnDesc{}
 	for rows.Next() {
 		var tableInfo ColumnDesc