Merge branch 'main' into set-value-modal

jorgerojas26 · Oct 12, 2024 · ff19a8e · ff19a8e
2 parents cabef15 + c4ac8f1
commit ff19a8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/components/ResultsTable.go b/components/ResultsTable.go
@@ -284,6 +284,7 @@ func (table *ResultsTable) AddInsertedRows() {
 			tableCell.SetExpansion(1)
 			tableCell.SetReference(inserts[i].PrimaryKeyValue)
 
+
 			tableCell.SetTextColor(app.Styles.PrimaryTextColor)
 			tableCell.SetBackgroundColor(colorTableInsert)
 
@@ -305,6 +306,7 @@ func (table *ResultsTable) AppendNewRow(cells []models.CellValue, index int, UUI
 			tableCell.SetText(strings.Replace(cell.Value.(string), "&", "", 1))
 			tableCell.SetStyle(table.GetItalicStyle())
 			// tableCell.SetText("")
+
 			tableCell.SetTextColor(app.Styles.InverseTextColor)
 		}
 

diff --git a/drivers/postgres.go b/drivers/postgres.go
@@ -521,14 +521,17 @@ func (db *Postgres) GetRecords(database, table, where, sort string, offset, limi
 	}
 	defer paginatedRows.Close()
 
-	if paginatedRows != nil {
-
-		rowsErr := paginatedRows.Err()
+	columns, columnsError := paginatedRows.Columns()
+	if columnsError != nil {
+		return nil, 0, columnsError
+	}
 
-		defer paginatedRows.Close()
+	records = append(records, columns)
 
-		if rowsErr != nil {
-			err = rowsErr
+	for paginatedRows.Next() {
+		rowValues := make([]interface{}, len(columns))
+		for i := range columns {
+			rowValues[i] = new(sql.RawBytes)
 		}
 
 		countQuery := "SELECT COUNT(*) FROM "