Add working tview, add working load ond Tables, remove giu

.gitignore

@@ -0,0 +1 @@
+db.*

cmd/sqv-cli/main.go

@@ -3,18 +3,18 @@ package main
 import (
 	"fmt"
 	"log"
-	"os"
 
 	engine "git.pablu.de/pablu/sqv-engine"
 )
 
 func main() {
-	file, err := os.ReadFile("test.sql")
+	fmt.Println("Started")
+
+	m, err := engine.NewManager("db.sqlite")
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	m := engine.NewManagerFromFile(string(file))
 	err = m.Start()
 	if err != nil {
 		log.Fatal(err)

cmd/sqv-giu/main.go

@@ -1,93 +0,0 @@
-package main
-
-import (
-	"log"
-	"os"
-
-	engine "git.pablu.de/pablu/sqv-engine"
-	g "github.com/AllenDang/giu"
-)
-
-type Test struct {
-	tables  []engine.Table
-	enabled []bool
-}
-
-func (t *Test) loop() {
-	tableMenuItems := make([]g.Widget, len(t.tables))
-
-	for i, table := range t.tables {
-		tableMenuItems[i] = g.MenuItem(table.Name).OnClick(func() {
-			t.enabled[i] = !t.enabled[i]
-		})
-	}
-
-	g.MainMenuBar().Layout(
-		g.Menu("Tables").Layout(
-			tableMenuItems...,
-		),
-	).Build()
-
-	for i, table := range t.tables {
-		if t.enabled[i] {
-			g.Window(table.Name).Layout(
-				SqlTable(table),
-			)
-		}
-	}
-}
-
-func SqlTable(table engine.Table) *g.TableWidget {
-	tableColumns := make([]*g.TableColumnWidget, 0)
-	for _, column := range table.Columns {
-		tableColumns = append(tableColumns, g.TableColumn(column.Name))
-	}
-
-	tableRows := make([]*g.TableRowWidget, 0)
-	for _, row := range table.Rows {
-		tableRows = append(tableRows, SqlValueRow(row))
-	}
-
-	return g.Table().Columns(
-		tableColumns...,
-	).Rows(tableRows...)
-}
-
-func SqlValueRow(row engine.Row) *g.TableRowWidget {
-	v := make([]g.Widget, 0)
-	for _, values := range row.Values {
-		v = append(v, g.Label(values))
-	}
-
-	return g.TableRow(v...)
-}
-
-func main() {
-	wnd := g.NewMasterWindow("SQV", 800, 600, 0)
-
-	//nolint:gocritic // should be here for doc
-	// errMarkers = imgui.NewErrorMarkers()
-	file, err := os.ReadFile("test.sql")
-	if err != nil {
-		log.Fatal(err)
-	}
-	m := engine.NewManagerFromFile(string(file))
-	if err := m.Start(); err != nil {
-		log.Fatal(err)
-	}
-
-	t := Test{
-		tables:  m.GetTables(),
-		enabled: make([]bool, len(m.GetTables())),
-	}
-
-	t.tables[2].Rows = []engine.Row{
-		engine.Row{
-			Values: []string{
-				"HELLO", "WORLD", "!",
-			},
-		},
-	}
-
-	wnd.Run(t.loop)
-}

cmd/sqv-tea/main.go

@@ -8,14 +8,11 @@ import (
 
 	engine "git.pablu.de/pablu/sqv-engine"
 	"github.com/charmbracelet/bubbles/table"
+	"github.com/charmbracelet/bubbles/textarea"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )
 
-var baseStyle = lipgloss.NewStyle().
-	BorderStyle(lipgloss.NormalBorder()).
-	BorderForeground(lipgloss.Color("240"))
-
 func tabBorderWithBottom(left, middle, right string) lipgloss.Border {
 	border := lipgloss.RoundedBorder()
 	border.BottomLeft = left
@@ -37,6 +34,7 @@ var (
 type model struct {
 	tables     []table.Model
 	tableNames []string
+	textarea   textarea.Model
 
 	currTable int
 }
@@ -97,7 +95,13 @@ func (m model) View() string {
 	row := lipgloss.JoinHorizontal(lipgloss.Top, renderedTabs...)
 	doc.WriteString(row)
 	doc.WriteString("\n")
-	doc.WriteString(windowStyle.Width((lipgloss.Width(row) - windowStyle.GetHorizontalFrameSize())).Render(m.tables[m.currTable].View()))
+	windowWidth := (lipgloss.Width(row) - windowStyle.GetHorizontalFrameSize())
+	doc.WriteString(windowStyle.Width(windowWidth).Render(m.tables[m.currTable].View()))
+	doc.WriteString("\n")
+
+	// Is this correct??
+	m.textarea.SetWidth(windowWidth)
+	doc.WriteString(windowStyle.Width(windowWidth).Render(m.textarea.View()))
 
 	return docStyle.Render(doc.String())
 	// return baseStyle.Render(m.table.View()) + "\n"
@@ -113,7 +117,7 @@ func convertToViewTable(m *engine.Manager) ([]string, []table.Model) {
 		for i, column := range t.Columns {
 			columns[i] = table.Column{
 				Title: column.Name,
-				Width: 10,
+				Width: max(lipgloss.Width(column.Name), 10),
 			}
 		}
 
@@ -134,7 +138,7 @@ func convertToViewTable(m *engine.Manager) ([]string, []table.Model) {
 			table.WithColumns(columns),
 			table.WithRows(rows),
 			table.WithFocused(true),
-			table.WithHeight(7),
+			table.WithHeight(25),
 		)
 
 		s := table.DefaultStyles()
@@ -167,7 +171,14 @@ func main() {
 
 	tableNames, tables := convertToViewTable(m)
 
-	p := tea.NewProgram(model{tables: tables, tableNames: tableNames}, tea.WithAltScreen())
+	ta := textarea.New()
+	ta.Placeholder = "select * from ?"
+	ta.Focus()
+
+	ta.Prompt = "| "
+	ta.CharLimit = 280
+
+	p := tea.NewProgram(model{tables: tables, tableNames: tableNames, textarea: ta}, tea.WithAltScreen())
 	if _, err := p.Run(); err != nil {
 		log.Fatalf("Alas, theres been an error: %v", err)
 	}

cmd/sqv-tview/main.go

@@ -0,0 +1,80 @@
+package main
+
+import (
+	"log"
+
+	engine "git.pablu.de/pablu/sqv-engine"
+	"github.com/gdamore/tcell/v2"
+	"github.com/rivo/tview"
+)
+
+func main() {
+	app := tview.NewApplication()
+
+	menu := tview.NewList()
+	table := tview.NewTable().SetBorders(true)
+	table.SetBorder(true).SetTitle("TABLE")
+
+	menu.SetTitle("TABLES").SetBorder(true)
+	menu.ShowSecondaryText(false).SetDoneFunc(func() {
+		table.Clear()
+	})
+
+	flex := tview.NewFlex().
+		AddItem(menu, 0, 1, true).
+		AddItem(table, 0, 3, true)
+
+	m, err := engine.NewManager("db.sqlite")
+	if err != nil {
+		log.Fatalf("Ran into an error on opening Manager, err: %v\n", err)
+	}
+	m.Start()
+
+	tables := m.GetTables()
+
+	for _, t := range tables {
+		menu.AddItem(t.Name, "", 0, nil)
+	}
+	menu.SetChangedFunc(func(index int, mainText, secondaryText string, shortcut rune) {
+		table.Clear()
+
+		t, ok := m.GetTable(mainText)
+		if !ok {
+			panic("AHHHHHHH")
+		}
+
+		for i, c := range t.Columns {
+			color := tcell.ColorDarkGreen
+			table.SetCell(0, i, tview.NewTableCell(c.Name).SetTextColor(color).SetAlign(tview.AlignCenter))
+		}
+
+		err = m.LoadTable(&t)
+		if err != nil {
+			panic(err)
+		}
+
+		for ri, r := range t.Rows {
+			for rc, c := range r.Values {
+				table.SetCell(ri+1, rc, tview.NewTableCell(c).SetTextColor(tcell.ColorWhite).SetAlign(tview.AlignCenter))
+			}
+		}
+	})
+	menu.SetCurrentItem(1)
+
+	table.Select(0, 0).SetFixed(1, 1).SetDoneFunc(func(key tcell.Key) {
+		switch key {
+		case tcell.KeyEscape:
+			app.Stop()
+		case tcell.KeyEnter:
+			table.SetSelectable(true, true)
+		}
+	}).SetSelectedFunc(func(row, column int) {
+		table.GetCell(row, column).SetTextColor(tcell.ColorRed)
+		table.SetSelectable(false, false)
+	})
+
+	if err := app.SetRoot(flex, true).EnableMouse(true).Run(); err != nil {
+		panic(err)
+	}
+
+}

go.mod

@@ -3,18 +3,21 @@ module git.pablu.de/pablu/sqv-engine
 go 1.25.3
 
 require (
-	github.com/AllenDang/giu v0.14.1
+	github.com/charmbracelet/lipgloss v1.1.0
+	github.com/gdamore/tcell/v2 v2.8.1
 	github.com/mattn/go-sqlite3 v1.14.32
+	github.com/rivo/tview v0.42.0
 )
 
 require (
+	github.com/atotto/clipboard v0.1.4 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
-	github.com/charmbracelet/lipgloss v1.1.0 // indirect
 	github.com/charmbracelet/x/ansi v0.10.1 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
+	github.com/gdamore/encoding v1.0.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-localereader v0.0.1 // indirect
@@ -24,23 +27,12 @@ require (
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	golang.org/x/term v0.28.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
 )
 
 require (
-	github.com/AllenDang/cimgui-go v1.3.2-0.20250409185506-6b2ff1aa26b5 // indirect
-	github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8 // indirect
 	github.com/charmbracelet/bubbles v0.21.0
 	github.com/charmbracelet/bubbletea v1.3.10
-	github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 // indirect
-	github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8 // indirect
-	github.com/mazznoer/csscolorparser v0.1.6 // indirect
-	github.com/napsy/go-css v1.0.0 // indirect
-	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
-	github.com/sahilm/fuzzy v0.1.1 // indirect
-	golang.design/x/hotkey v0.4.1 // indirect
-	golang.design/x/mainthread v0.3.0 // indirect
-	golang.org/x/image v0.27.0 // indirect
 	golang.org/x/sys v0.36.0 // indirect
-	gopkg.in/eapache/queue.v1 v1.1.0 // indirect
 )

go.sum

@@ -1,11 +1,11 @@
-github.com/AllenDang/cimgui-go v1.3.2-0.20250409185506-6b2ff1aa26b5 h1:IulPfLSfrjCzSr7TOn7777rl5qRMu39gEOxSTDm2wes=
+github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
-github.com/AllenDang/cimgui-go v1.3.2-0.20250409185506-6b2ff1aa26b5/go.mod h1:Fg1LjMFQs91yohW3SccUhqUeuNQEeL5KX3mgEjnDh7A=
+github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
-github.com/AllenDang/giu v0.14.1 h1:SqMt2peaqb3wWPkZ7m+dnJX4LddZNDduYz5jpo+LOxQ=
+github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
-github.com/AllenDang/giu v0.14.1/go.mod h1:gD5hmav1LbkjL2/1O3Mpohl2Lb/uqrrOKSeZFeqQjD0=
+github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8 h1:dKZMqib/yUDoCFigmz2agG8geZ/e3iRq304/KJXqKyw=
-github.com/AllenDang/go-findfont v0.0.0-20200702051237-9f180485aeb8/go.mod h1:b4uuDd0s6KRIPa84cEEchdQ9ICh7K0OryZHbSzMca9k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
+github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
 github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
 github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
 github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
@@ -18,14 +18,17 @@ github.com/charmbracelet/x/ansi v0.10.1 h1:rL3Koar5XvX0pHGfovN03f5cxLbCF2YvLeyz7
 github.com/charmbracelet/x/ansi v0.10.1/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
 github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8=
 github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
+github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
 github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
 github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
-github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 h1:baVdMKlASEHrj19iqjARrPbaRisD7EuZEVJj6ZMLl1Q=
+github.com/gdamore/encoding v1.0.1 h1:YzKZckdBL6jVt2Gc+5p82qhrGiqMdG/eNs6Wy0u3Uhw=
-github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3/go.mod h1:VEPNJUlxl5KdWjDvz6Q1l+rJlxF2i6xqDeGuGAxa87M=
+github.com/gdamore/encoding v1.0.1/go.mod h1:0Z0cMFinngz9kS1QfMjCP8TY7em3bZYeeklsSDPivEo=
-github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8 h1:aczNwZRrReVWrZcqxvDjDmxP1NFISTAu+1Cp+3OCbUg=
+github.com/gdamore/tcell/v2 v2.8.1 h1:KPNxyqclpWpWQlPLx6Xui1pMk8S+7+R37h3g07997NU=
-github.com/gucio321/glm-go v0.0.0-20241029220517-e1b5a3e011c8/go.mod h1:Z3+NtD1rjXUVZg97dojhs70i5oneOrZ1xcFKfF/c2Ts=
+github.com/gdamore/tcell/v2 v2.8.1/go.mod h1:bj8ori1BG3OYMjmb3IklZVWfZUJ1UBQt9JXrOCOhGWw=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
@@ -36,42 +39,88 @@ github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6T
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
 github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/mazznoer/csscolorparser v0.1.6 h1:uK6p5zBA8HaQZJSInHgHVmkVBodUAy+6snSmKJG7pqA=
-github.com/mazznoer/csscolorparser v0.1.6/go.mod h1:OQRVvgCyHDCAquR1YWfSwwaDcM0LhnSffGnlbOew/3I=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
 github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
-github.com/napsy/go-css v1.0.0 h1:I1EiqpOJqo8eshGhm6OQXefXOfNgnp1SLOVfqcTeY2U=
+github.com/rivo/tview v0.42.0 h1:b/ftp+RxtDsHSaynXTbJb+/n/BxDEi+W3UfF5jILK6c=
-github.com/napsy/go-css v1.0.0/go.mod h1:HqZYcKcNnv50fgOTdGUn9YbJa2qC9oJ3kLnyrwwVzUI=
+github.com/rivo/tview v0.42.0/go.mod h1:cSfIYfhpSGCjp3r/ECJb+GKS7cGJnqV8vfjQPwoXyfY=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rqlite/sql v0.0.0-20250623131620-453fa49cad04 h1:bjr7gZERAJhYhqkLHXbkBSpjbB+PlgW6e9CRCJ2+J/w=
-github.com/rqlite/sql v0.0.0-20250623131620-453fa49cad04/go.mod h1:ib9zVtNgRKiGuoMyUqqL5aNpk+r+++YlyiVIkclVqPg=
-github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
-github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
-golang.design/x/hotkey v0.4.1 h1:zLP/2Pztl4WjyxURdW84GoZ5LUrr6hr69CzJFJ5U1go=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.design/x/hotkey v0.4.1/go.mod h1:M8SGcwFYHnKRa83FpTFQoZvPO5vVT+kWPztFqTQKmXA=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.design/x/mainthread v0.3.0 h1:UwFus0lcPodNpMOGoQMe87jSFwbSsEY//CA7yVmu4j8=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.design/x/mainthread v0.3.0/go.mod h1:vYX7cF2b3pTJMGM/hc13NmN6kblKnf4/IyvHeu259L0=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
-golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
 golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
-gopkg.in/eapache/queue.v1 v1.1.0 h1:EldqoJEGtXYiVCMRo2C9mePO2UUGnYn2+qLmlQSqPdc=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-gopkg.in/eapache/queue.v1 v1.1.0/go.mod h1:wNtmx1/O7kZSR9zNT1TTOJ7GLpm3Vn7srzlfylFbQwU=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

manager.go

@@ -1,28 +1,66 @@
 package engine
 
 import (
+	"database/sql"
+	"encoding/hex"
 	"errors"
 	"fmt"
 	"io"
 	"log"
 	"slices"
+	"strconv"
 	"strings"
 
-	"git.pablu.de/pablu/sqv-engine/sql"
+	_ "github.com/mattn/go-sqlite3"
+
+	engine "git.pablu.de/pablu/sqv-engine/sql"
 )
 
 type Manager struct {
-	parser *sql.Parser
+	parser *engine.Parser
 
+	conn   *sql.DB
 	tables []Table
 }
 
 func NewManagerFromFile(sqlTxt string) *Manager {
 	return &Manager{
-		parser: sql.NewParser(strings.NewReader(sqlTxt)),
+		parser: engine.NewParser(strings.NewReader(sqlTxt)),
 	}
 }
 
+func NewManager(path string) (*Manager, error) {
+	db, err := sql.Open("sqlite3", path)
+	if err != nil {
+		return nil, err
+	}
+
+	var sqls []string
+	r, err := db.Query("SELECT name, sql FROM sqlite_schema WHERE type = 'table' AND name NOT LIKE 'sqlite_%'")
+	if err != nil {
+		return nil, err
+	}
+
+	for r.Next() {
+		var name, sql string
+
+		if err := r.Scan(&name, &sql); err != nil {
+			return nil, err
+		}
+
+		sqls = append(sqls, sql)
+	}
+
+	schema := strings.Join(sqls, ";")
+	schema += ";"
+	// fmt.Println(schema)
+
+	return &Manager{
+		parser: engine.NewParser(strings.NewReader(schema)),
+		conn:   db,
+	}, nil
+}
+
 func (m *Manager) Start() error {
 	for {
 		stmt, err := m.parser.Parse()
@@ -30,11 +68,11 @@ func (m *Manager) Start() error {
 			fmt.Println("Finished parsing")
 			break
 		} else if err != nil {
-			log.Fatal(err)
+			return err
 		}
 
 		switch v := stmt.(type) {
-		case *sql.CreateTableStatement:
+		case *engine.CreateTableStatement:
 			t, err := m.convertCreateTableStatementToTable(v)
 			if err != nil {
 				return err
@@ -50,7 +88,7 @@ func (m *Manager) Start() error {
 }
 
 func (m *Manager) Refresh(sqlTxt string) error {
-	m.parser = sql.NewParser(strings.NewReader(sqlTxt))
+	m.parser = engine.NewParser(strings.NewReader(sqlTxt))
 	m.tables = make([]Table, 0)
 
 	return m.Start()
@@ -65,14 +103,73 @@ func (m *Manager) GetTable(name string) (Table, bool) {
 		return t.Name == name
 	})
 
-	if index >= 0 {
+	if index < 0 {
-		return m.tables[index], true
-	}
-
 		return Table{}, false
 	}
+	table := m.tables[index]
 
-func (m *Manager) convertCreateTableStatementToTable(cts *sql.CreateTableStatement) (Table, error) {
+	return table, true
+}
+
+func (m *Manager) LoadTable(table *Table) error {
+	rows, err := m.conn.Query(fmt.Sprintf("SELECT * FROM %v", table.Name))
+	if err != nil {
+		return err
+	}
+	table.Rows = make([]Row, 0)
+
+	for rows.Next() {
+		cols := make([]any, len(table.Columns))
+		for i, column := range table.Columns {
+			switch column.Type {
+			case BLOB:
+				cols[i] = new([]byte)
+			case TEXT:
+				cols[i] = new(string)
+			case INTEGER:
+				cols[i] = new(int)
+			case REAL:
+				cols[i] = new(float64)
+			default:
+				panic("THIS SHOULD NEVER HAPPEN, WE HIT AN UNKNOWN COLUMN.TYPE")
+			}
+		}
+
+		err = rows.Scan(cols...)
+		if err != nil {
+			return err
+		}
+
+		table.Rows = append(table.Rows, Row{
+			Values: anyToStr(cols),
+		})
+	}
+
+	return nil
+}
+
+func anyToStr(a []any) []string {
+	res := make([]string, len(a))
+
+	for i, c := range a {
+		switch v := c.(type) {
+		case *string:
+			res[i] = *v
+		case *int:
+			res[i] = strconv.Itoa(*v)
+		case *float64:
+			res[i] = strconv.FormatFloat(*v, 'f', 2, 64)
+		case *[]byte:
+			res[i] = hex.EncodeToString(*v)
+		default:
+			panic("THIS SHOULD NEVER HAPPEN, WE GOT SERVED AN UNKNOWN TYPE")
+		}
+	}
+
+	return res
+}
+
+func (m *Manager) convertCreateTableStatementToTable(cts *engine.CreateTableStatement) (Table, error) {
 	res := Table{
 		Name:    cts.TableName,
 		Columns: make([]Column, len(cts.Columns)),
@@ -106,8 +203,22 @@ func (m *Manager) convertCreateTableStatementToTable(cts *sql.CreateTableStateme
 			ref = &refTable.Columns[colIndex]
 		}
 
+		var columnType ColumnType
+		switch column.Type {
+		case "REAL":
+			columnType = REAL
+		case "BLOB":
+			columnType = BLOB
+		case "TEXT":
+			columnType = TEXT
+		case "INTEGER":
+			columnType = INTEGER
+		default:
+			panic("This shouldnt happen")
+		}
+
 		res.Columns[i] = Column{
-			Type:      column.Type,
+			Type:      columnType,
 			Name:      column.Name,
 			Reference: ref,
 			Flags:     flags,

sql/lexer.go

@@ -19,11 +19,21 @@ const (
 	LPAREN
 	RPAREN
 	COMMA
+	ASTERIKS
+	ASSIGN
 
 	// Keywords
 	CREATE
 	TABLE
 
+	SELECT
+	FROM
+	WHERE
+	AND
+	OR
+	ORDER
+	TOP
+
 	PRIMARY
 	FOREIGN
 	REFERENCES
@@ -35,6 +45,8 @@ const (
 	TEXT
 	INTEGER
 	NULL
+	REAL
+	BLOB
 )
 
 var keywords map[string]Token = map[string]Token{
@@ -50,6 +62,15 @@ var keywords map[string]Token = map[string]Token{
 	"NULL":       NULL,
 	"IF":         IF,
 	"EXISTS":     EXISTS,
+	"SELECT":     SELECT,
+	"FROM":       FROM,
+	"WHERE":      WHERE,
+	"AND":        AND,
+	"OR":         OR,
+	"ORDER":      ORDER,
+	"TOP":        TOP,
+	"REAL":       REAL,
+	"BLOB":       BLOB,
 }
 
 type Position struct {
@@ -91,6 +112,10 @@ func (l *Lexer) Lex() (Position, Token, string) {
 			return l.pos, LPAREN, "("
 		case ')':
 			return l.pos, RPAREN, ")"
+		case '*':
+			return l.pos, ASTERIKS, "*"
+		case '=':
+			return l.pos, ASSIGN, "="
 		default:
 			if unicode.IsSpace(r) {
 				continue

sql/parser.go

@@ -89,6 +89,38 @@ func (p *Parser) Parse() (Statement, error) {
 
 			stmt.Columns[column].Extra = append(stmt.Columns[column].Extra, ref)
 
+		case PRIMARY:
+			if !p.expectSequence(KEY, LPAREN, IDENT) {
+				return nil, p.unexpectedToken()
+			}
+			primaryKeyNames := make([]string, 0)
+			_, _, columnName := p.rescan()
+			primaryKeyNames = append(primaryKeyNames, columnName)
+
+			for {
+				tok, ok := p.expectOne(RPAREN, COMMA)
+				if !ok {
+					return nil, p.unexpectedToken()
+				}
+				if tok == RPAREN {
+					break
+				}
+
+				if !p.expectNext(IDENT) {
+					return nil, p.unexpectedToken()
+				}
+
+				_, _, columnName := p.rescan()
+				primaryKeyNames = append(primaryKeyNames, columnName)
+			}
+
+			for _, pkName := range primaryKeyNames {
+				column := slices.IndexFunc(stmt.Columns, func(c Column) bool {
+					return c.Name == pkName
+				})
+				stmt.Columns[column].Extra = append(stmt.Columns[column].Extra, "PRIMARY_KEY")
+			}
+
 		case COMMA:
 			continue
 
@@ -102,8 +134,8 @@ func (p *Parser) parseColumn() (Column, error) {
 	_, _, lit := p.rescan()
 	column := Column{Name: lit, Extra: make([]string, 0)}
 
-	if _, ok := p.expectOne(TEXT, INTEGER); !ok {
+	if _, ok := p.expectOne(TEXT, INTEGER, REAL, BLOB); !ok {
-		return Column{}, p.unexpectedToken(TEXT, INTEGER)
+		return Column{}, p.unexpectedToken(TEXT, INTEGER, REAL, BLOB)
 	}
 	_, _, column.Type = p.rescan()
 

table.go

@@ -20,19 +20,22 @@ func (v ColumnFlag) Has(flag ColumnFlag) bool {
 	return v&flag == flag
 }
 
+type ColumnType uint32
+
+const (
+	TEXT ColumnType = iota
+	INTEGER
+	REAL
+	BLOB
+)
+
 type Column struct {
-	Type      string
+	Type      ColumnType
 	Name      string
 	Reference *Column
 	Flags     ColumnFlag
 }
 
-
-// For testing purposes its string right now
-// type Value interface {
-// 	Representation() string
-// }
-
 type Row struct {
 	// This should be map but to Column so its always the right Column but for testing this is a slice now
 	Values []string