Skip to content

Commit

Permalink
fix(linter): naming conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
@konart
konart committed Jan 11, 2024
1 parent 6012400 commit ea30fc6
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion components/ConnectionSelection.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ func (cs *ConnectionSelection) connect(connectionUrl string) {
cs.StatusText.SetText("Connecting...").SetTextStyle(tcell.StyleDefault.Foreground(app.ActiveTextColor))
App.Draw()

newDbDriver := drivers.MySql{}
newDbDriver := drivers.MySQL{}
newDbDriver.SetConnectionString(connectionUrl)

err := newDbDriver.Connect()
Expand Down
26 changes: 13 additions & 13 deletions components/ResultsTable.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type ResultsTable struct {
EditorPages *tview.Pages
ResultsInfo *tview.TextView
Tree *Tree
DBDriver *drivers.MySql
DBDriver *drivers.MySQL
}

var (
Expand All @@ -55,7 +55,7 @@ var (
DeleteColor = tcell.ColorRed
)

func NewResultsTable(listOfDbChanges *[]models.DbDmlChange, listOfDbInserts *[]models.DbInsert, tree *Tree, dbdriver *drivers.MySql) *ResultsTable {
func NewResultsTable(listOfDbChanges *[]models.DbDmlChange, listOfDbInserts *[]models.DbInsert, tree *Tree, dbdriver *drivers.MySQL) *ResultsTable {
state := &ResultsTableState{
records: [][]string{},
columns: [][]string{},
Expand Down Expand Up @@ -201,7 +201,7 @@ func (table *ResultsTable) AddInsertedRows() {
for j, cell := range row {
tableCell := tview.NewTableCell(cell)
tableCell.SetExpansion(1)
tableCell.SetReference(inserts[i].RowId)
tableCell.SetReference(inserts[i].RowID)

tableCell.SetTextColor(app.FocusTextColor)
tableCell.SetBackgroundColor(InsertColor)
Expand Down Expand Up @@ -397,7 +397,7 @@ func (table *ResultsTable) tableInputCapture(event *tcell.EventKey) *tcell.Event
for i, insertedRow := range *table.state.listOfDbInserts {
cellReference := table.GetCell(selectedRowIndex, 0).GetReference()

if cellReference != nil && insertedRow.RowId.String() == cellReference.(uuid.UUID).String() {
if cellReference != nil && insertedRow.RowID.String() == cellReference.(uuid.UUID).String() {
isAnInsertedRow = true
indexOfInsertedRow = i
}
Expand Down Expand Up @@ -447,7 +447,7 @@ func (table *ResultsTable) tableInputCapture(event *tcell.EventKey) *tcell.Event
Table: table.GetDBReference(),
Columns: table.GetRecords()[0],
Values: newRow,
RowId: newRowUuid,
RowID: newRowUuid,
Option: 1,
}

Expand Down Expand Up @@ -958,19 +958,19 @@ func (table *ResultsTable) StartEditingCell(row int, col int, callback func(newV
App.SetFocus(inputField)
}

func (table *ResultsTable) CheckIfRowIsInserted(rowId uuid.UUID) bool {
func (table *ResultsTable) CheckIfRowIsInserted(rowID uuid.UUID) bool {
for _, insertedRow := range *table.state.listOfDbInserts {
if insertedRow.RowId == rowId {
if insertedRow.RowID == rowID {
return true
}
}

return false
}

func (table *ResultsTable) MutateInsertedRowCell(rowId uuid.UUID, colIndex int, newValue string) {
func (table *ResultsTable) MutateInsertedRowCell(rowID uuid.UUID, colIndex int, newValue string) {
for i, insertedRow := range *table.state.listOfDbInserts {
if insertedRow.RowId == rowId {
if insertedRow.RowID == rowID {
(*table.state.listOfDbInserts)[i].Values[colIndex] = newValue
}
}
Expand All @@ -992,13 +992,13 @@ func (table *ResultsTable) AppendNewChange(changeType string, tableName string,
}

if !isInsertedRow {
selectedRowId := table.GetRecords()[rowIndex][0]
selectedRowID := table.GetRecords()[rowIndex][0]

alreadyExists := false
indexOfChange := -1

for i, change := range *table.state.listOfDbChanges {
if change.RowId == selectedRowId && change.Column == table.GetColumnNameByIndex(colIndex) {
if change.RowID == selectedRowID && change.Column == table.GetColumnNameByIndex(colIndex) {
alreadyExists = true
indexOfChange = i
}
Expand Down Expand Up @@ -1038,7 +1038,7 @@ func (table *ResultsTable) AppendNewChange(changeType string, tableName string,
Table: tableName,
Column: columnName,
Value: value,
RowId: selectedRowId,
RowID: selectedRowID,
Option: 1,
}

Expand Down Expand Up @@ -1078,7 +1078,7 @@ func (table *ResultsTable) AppendNewChange(changeType string, tableName string,
Table: tableName,
Column: "",
Value: "",
RowId: selectedRowId,
RowID: selectedRowID,
Option: 1,
}

Expand Down
48 changes: 24 additions & 24 deletions drivers/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/xo/dburl"
)

type MySql struct {
type MySQL struct {
conn *sql.DB
connectionString string
lastExecutedQuery string
}

func (db *MySql) TestConnection() error {
func (db *MySQL) TestConnection() error {
var err error

db.conn, err = dburl.Open(db.connectionString)
Expand All @@ -36,7 +36,7 @@ func (db *MySql) TestConnection() error {
return nil
}

func (db *MySql) Connect() error {
func (db *MySQL) Connect() error {
var err error

db.conn, err = dburl.Open(db.connectionString)
Expand All @@ -63,15 +63,15 @@ func (db *MySql) Connect() error {
return nil
}

func (db *MySql) SetConnectionString(connectionString string) {
func (db *MySQL) SetConnectionString(connectionString string) {
db.connectionString = connectionString
}

func (db *MySql) GetConnectionString() string {
func (db *MySQL) GetConnectionString() string {
return db.connectionString
}

func (db *MySql) GetDatabases() ([]string, error) {
func (db *MySQL) GetDatabases() ([]string, error) {
var databases []string

rows, err := db.conn.Query("SHOW DATABASES")
Expand All @@ -90,7 +90,7 @@ func (db *MySql) GetDatabases() ([]string, error) {
return databases, nil
}

func (db *MySql) GetTables(database string) ([]string, error) {
func (db *MySQL) GetTables(database string) ([]string, error) {
var tables []string

rows, err := db.conn.Query("SHOW TABLES FROM " + database)
Expand All @@ -107,7 +107,7 @@ func (db *MySql) GetTables(database string) ([]string, error) {
return tables, nil
}

func (db *MySql) DescribeTable(table string) (results [][]string) {
func (db *MySQL) DescribeTable(table string) (results [][]string) {
rows, _ := db.conn.Query("DESCRIBE " + table)
defer rows.Close()

Expand All @@ -134,7 +134,7 @@ func (db *MySql) DescribeTable(table string) (results [][]string) {
return
}

func (db *MySql) GetTableConstraints(table string) (results [][]string) {
func (db *MySQL) GetTableConstraints(table string) (results [][]string) {
splitTableString := strings.Split(table, ".")
database := splitTableString[0]
tableName := splitTableString[1]
Expand Down Expand Up @@ -166,7 +166,7 @@ func (db *MySql) GetTableConstraints(table string) (results [][]string) {
return
}

func (db *MySql) GetTableForeignKeys(table string) (results [][]string) {
func (db *MySQL) GetTableForeignKeys(table string) (results [][]string) {
splitTableString := strings.Split(table, ".")
database := splitTableString[0]
tableName := splitTableString[1]
Expand Down Expand Up @@ -197,7 +197,7 @@ func (db *MySql) GetTableForeignKeys(table string) (results [][]string) {
return
}

func (db *MySql) GetTableIndexes(table string) (results [][]string) {
func (db *MySQL) GetTableIndexes(table string) (results [][]string) {
rows, _ := db.conn.Query("SHOW INDEX FROM " + table) // TODO: handle error
defer rows.Close()

Expand All @@ -224,7 +224,7 @@ func (db *MySql) GetTableIndexes(table string) (results [][]string) {
return
}

func (db *MySql) GetRecords(table string, where string, sort string, offset int, limit int, appendColumns bool) (results [][]string, err error) {
func (db *MySQL) GetRecords(table string, where string, sort string, offset int, limit int, appendColumns bool) (results [][]string, err error) {
defaultLimit := 100

if limit != 0 {
Expand Down Expand Up @@ -276,7 +276,7 @@ func (db *MySql) GetRecords(table string, where string, sort string, offset int,
}

// Get paginated records
func (db *MySql) GetPaginatedRecords(table string, where string, sort string, offset int, limit int, appendColumns bool) (paginatedResults [][]string, totalRecords int, err error) {
func (db *MySQL) GetPaginatedRecords(table string, where string, sort string, offset int, limit int, appendColumns bool) (paginatedResults [][]string, totalRecords int, err error) {
defaultLimit := 300

if limit != 0 {
Expand Down Expand Up @@ -337,7 +337,7 @@ func (db *MySql) GetPaginatedRecords(table string, where string, sort string, of
return
}

func (db *MySql) QueryPaginatedRecords(query string) (results [][]string, err error) {
func (db *MySQL) QueryPaginatedRecords(query string) (results [][]string, err error) {
rows, err := db.conn.Query(query)
if err != nil {
return results, err
Expand Down Expand Up @@ -369,21 +369,21 @@ func (db *MySql) QueryPaginatedRecords(query string) (results [][]string, err er
return
}

func (db *MySql) UpdateRecord(table string, column string, value string, id string) error {
func (db *MySQL) UpdateRecord(table string, column string, value string, id string) error {
query := fmt.Sprintf("UPDATE %s SET %s = \"%s\" WHERE id = \"%s\"", table, column, value, id)
_, err := db.conn.Exec(query)

return err
}

func (db *MySql) DeleteRecord(table string, id string) error {
func (db *MySQL) DeleteRecord(table string, id string) error {
query := fmt.Sprintf("DELETE FROM %s WHERE id = \"%s\"", table, id)
_, err := db.conn.Exec(query)

return err
}

func (db *MySql) ExecuteDMLQuery(query string) (result string, err error) {
func (db *MySQL) ExecuteDMLQuery(query string) (result string, err error) {
res, error := db.conn.Exec(query)

if error != nil {
Expand All @@ -395,11 +395,11 @@ func (db *MySql) ExecuteDMLQuery(query string) (result string, err error) {
}
}

func (db *MySql) GetLastExecutedQuery() string {
func (db *MySQL) GetLastExecutedQuery() string {
return db.lastExecutedQuery
}

func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []models.DbInsert) (err error) {
func (db *MySQL) ExecutePendingChanges(changes []models.DbDmlChange, inserts []models.DbInsert) (err error) {
queries := make([]string, 0, len(changes)+len(inserts))

// This will hold grouped changes by their RowId and Table
Expand All @@ -409,7 +409,7 @@ func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []m
// Group changes by RowId and Table
for _, change := range changes {
if change.Type == "UPDATE" {
key := fmt.Sprintf("%s|%s", change.Table, change.RowId)
key := fmt.Sprintf("%s|%s", change.Table, change.RowID)
groupedUpdated[key] = append(groupedUpdated[key], change)
} else if change.Type == "DELETE" {
groupedDeletes = append(groupedDeletes, change)
Expand All @@ -423,7 +423,7 @@ func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []m
// Split key into table and rowId
splitted := strings.Split(key, "|")
table := splitted[0]
rowId := splitted[1]
rowID := splitted[1]

for _, change := range changes {
columns = append(columns, fmt.Sprintf("%s='%s'", change.Column, change.Value))
Expand All @@ -432,7 +432,7 @@ func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []m
// Merge all column updates
updateClause := strings.Join(columns, ", ")

query := fmt.Sprintf("UPDATE %s SET %s WHERE id = '%s';", table, updateClause, rowId)
query := fmt.Sprintf("UPDATE %s SET %s WHERE id = '%s';", table, updateClause, rowID)

queries = append(queries, query)
}
Expand All @@ -442,7 +442,7 @@ func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []m
query := ""

statementType = "DELETE FROM"
query = fmt.Sprintf("%s %s WHERE id = \"%s\"", statementType, delete.Table, delete.RowId)
query = fmt.Sprintf("%s %s WHERE id = \"%s\"", statementType, delete.Table, delete.RowID)

if query != "" {
queries = append(queries, query)
Expand Down Expand Up @@ -503,6 +503,6 @@ func (db *MySql) ExecutePendingChanges(changes []models.DbDmlChange, inserts []m
return err
}

func (db *MySql) GetUpdateQuery(table string, column string, value string, whereCol string, whereVal string) string {
func (db *MySQL) GetUpdateQuery(table string, column string, value string, whereCol string, whereVal string) string {
return fmt.Sprintf("UPDATE %s SET %s = \"%s\" WHERE %s = \"%s\"", table, column, value, whereCol, whereVal)
}
4 changes: 2 additions & 2 deletions models/models.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ type DbDmlChange struct {
Table string
Column string
Value string
RowId string
RowID string
Option int
}

Expand All @@ -38,5 +38,5 @@ type DbInsert struct {
Columns []string
Values []string
Option int
RowId uuid.UUID
RowID uuid.UUID
}

0 comments on commit ea30fc6

Please sign in to comment.