diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 32de796..8b1fa9a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -51,13 +51,13 @@ make up Then, you'll have 2 containers up and running in your system for every kind of database supported by dblab. -Run dblab openning a connection with the postgres container. +Run dblab opening a connection with the postgres container. ```bash make run ``` -You can do the same with the mysql container by runnning: +You can do the same with the mysql container by running: ```bash make run-mysql diff --git a/README.md b/README.md index 36cb1cd..80a662e 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ $ dblab --url postgres://user:password@host:port/database?sslmode=[mode] --schem As a request made in [#125](https://github.com/danvergara/dblab/issues/125), support for MySQL/MariaDB sockets was integrated. ```sh -$ dblab --url "mysql://user:pasword@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" +$ dblab --url "mysql://user:password@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" $ dblab --socket /path/to/socket/mysql.sock --user user --db dbname --pass password --ssl disable --port 5432 --driver mysql --limit 50 ``` diff --git a/docs/quickstart.md b/docs/quickstart.md index 5044145..f9f4ff9 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -38,7 +38,7 @@ dblab --url postgres://user:password@host:port/database?sslmode=[mode] --schema As a request made in [#125](https://github.com/danvergara/dblab/issues/125), support for MySQL/MariaDB sockets was integrated. ```{ .sh .copy } -dblab --url "mysql://user:pasword@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" +dblab --url "mysql://user:password@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" ``` ```{ .sh .copy } dblab --socket /path/to/socket/mysql.sock --user user --db dbname --pass password --ssl disable --port 5432 --driver mysql --limit 50 diff --git a/docs/usage.md b/docs/usage.md index 275bd51..3ac4d38 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -123,7 +123,7 @@ dblab --url postgres://user:password@host:port/database?sslmode=[mode] --schema As a request made in [#125](https://github.com/danvergara/dblab/issues/125), support for MySQL/MariaDB sockets was integrated. ```{ .sh .copy } -dblab --url "mysql://user:pasword@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" +dblab --url "mysql://user:password@unix(/path/to/socket/mysql.sock)/dbname?charset=utf8" ``` ```{ .sh .copy } dblab --socket /path/to/socket/mysql.sock --user user --db dbname --pass password --ssl disable --port 5432 --driver mysql --limit 50 diff --git a/pkg/client/client.go b/pkg/client/client.go index 7c16e14..05b45d9 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -132,7 +132,7 @@ type Metadata struct { TotalPages int } -// Metadata retunrs the most relevant data from a given table. +// Metadata returns the most relevant data from a given table. func (c *Client) Metadata(tableName string) (*Metadata, error) { count, err := c.tableCount(tableName) if err != nil { diff --git a/pkg/config/config.go b/pkg/config/config.go index c375d64..e7241ca 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -186,7 +186,7 @@ func (c *Config) GetSQLXDBConnStr() string { return c.getSQLXConnStr(c.Host, c.DBName) } -// getDBConnStr returns the connection string based on the provied host and db name. +// getDBConnStr returns the connection string based on the provided host and db name. func (c *Config) getDBConnStr(dbhost, dbname string) string { switch c.Driver { case drivers.Postgres: @@ -216,7 +216,7 @@ func (c *Config) getDBConnStr(dbhost, dbname string) string { } } -// getSQLXConnStr returns the connection string based on the provied host and db name. +// getSQLXConnStr returns the connection string based on the provided host and db name. func (c *Config) getSQLXConnStr(dbhost, dbname string) string { switch c.Driver { case drivers.Postgres: diff --git a/pkg/form/form.go b/pkg/form/form.go index 8795ebf..af49811 100644 --- a/pkg/form/form.go +++ b/pkg/form/form.go @@ -227,9 +227,9 @@ func initModel() Model { sslKey.Placeholder = "The location for the secret key used for the client certificate" sslKey.CharLimit = 1000 - sslPassord := textinput.NewModel() - sslPassord.Placeholder = "The password for the secret key" - sslPassord.CharLimit = 1000 + sslPassword := textinput.NewModel() + sslPassword.Placeholder = "The password for the secret key" + sslPassword.CharLimit = 1000 sslRootCert := textinput.NewModel() sslRootCert.Placeholder = "The name of a file containing SSL certificate authority (CA) certificate(s)" @@ -255,7 +255,7 @@ func initModel() Model { filePathInput: filePath, sslCertInput: sslCert, sslKeyInput: sslKey, - sslPasswordInput: sslPassord, + sslPasswordInput: sslPassword, sslRootcertInput: sslRootCert, } diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go index 92fb935..0d619bf 100644 --- a/pkg/gui/view_helpers.go +++ b/pkg/gui/view_helpers.go @@ -81,7 +81,7 @@ func moveCursorHorizontally(direction string) func(g *gocui.Gui, v *gocui.View) // moveCursorVertically moves the cursor vertically given a direction. // the down position is handled in a special way to prevent the cursor keep going -// down when there's no characaters in the next lines. +// down when there's no characters in the next lines. func moveCursorVertically(direction string) func(g *gocui.Gui, v *gocui.View) error { return func(g *gocui.Gui, v *gocui.View) error { if v != nil {