🐛 Fix issue with PRQL build (#9)

Now, PRQL is not included in dev builds unless the prql tags is specified with make prql

Author: julien040

.goreleaser.yaml

@@ -16,6 +16,7 @@ builds:
       - fts5
       - sqlite_json
       - sqlite_math_functions
+      - prql
 
     ldflags:
       - -s -w
@@ -46,6 +47,7 @@ builds:
       - fts5
       - sqlite_json
       - sqlite_math_functions
+      - prql
 
     ldflags:
       - -s -w
@@ -70,6 +72,7 @@ builds:
       - fts5
       - sqlite_json
       - sqlite_math_functions
+      - prql
     ldflags:
       - -s -w
     env:

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-  "go.buildTags": "vtable"
+    "go.buildTags": "vtable fts5 sqlite_json sqlite_math_functions"
 }

makefile

@@ -3,15 +3,18 @@ FILES:= main.go
 ifdef CC
 CC := $(CC)
 else
-CC := "gcc -O3"
+CC := "gcc -O2"
 endif
 
-TAGS := "vtable fts5 sqlite_json sqlite_math_functions"
-
+TAGS := vtable fts5 sqlite_json sqlite_math_functions
+ 
 BUILD_FLAGS := "-ldflags=-s -w"
 
 all: $(FILES)
-	go build -o main.out -tags $(TAGS) $(BUILD_FLAGS) $(FILES)
+	go build -o main.out -tags "$(TAGS)" $(BUILD_FLAGS) $(FILES)
+
+prql: $(FILES)
+	go build -o main.out -tags "$(TAGS) prql" $(BUILD_FLAGS) $(FILES)
 
 clean:
 	rm -f main.out

other/prql/prql.go

@@ -1,3 +1,5 @@
+//go:build prql
+
 package prql
 
 // #cgo CFLAGS: -I.
@@ -26,21 +28,6 @@ import (
 	"unsafe"
 )
 
-type SourceLocationError struct {
-	startLine   int
-	startColumn int
-	endLine     int
-	endColumn   int
-}
-
-type CompileMessage struct {
-	ErrorCode rune
-	// Annoted code containing the error and the hints
-	Display string
-	// The location of the error
-	LocationError SourceLocationError
-}
-
 func ToSQL(prqlQuery string) (string, []CompileMessage) {
 	res := C.to_sql(C.CString(prqlQuery))
 	a := res.messages
@@ -59,10 +46,10 @@ func ToSQL(prqlQuery string) (string, []CompileMessage) {
 			}
 
 			if message.location != nil {
-				compileMessage.LocationError.startLine = int(message.location.start_line)
-				compileMessage.LocationError.startColumn = int(message.location.start_col)
-				compileMessage.LocationError.endLine = int(message.location.end_line)
-				compileMessage.LocationError.endColumn = int(message.location.end_col)
+				compileMessage.LocationError.StartLine = int(message.location.start_line)
+				compileMessage.LocationError.StartColumn = int(message.location.start_col)
+				compileMessage.LocationError.EndLine = int(message.location.end_line)
+				compileMessage.LocationError.EndColumn = int(message.location.end_col)
 			}
 
 			messages[i] = compileMessage

other/prql/prql_blank.go

@@ -0,0 +1,7 @@
+//go:build !prql
+
+package prql
+
+func ToSQL(prqlQuery string) (string, []CompileMessage) {
+	return prqlQuery, nil
+}

other/prql/types.go

@@ -0,0 +1,16 @@
+package prql
+
+type SourceLocationError struct {
+	StartLine   int
+	StartColumn int
+	EndLine     int
+	EndColumn   int
+}
+
+type CompileMessage struct {
+	ErrorCode rune
+	// Annoted code containing the error and the hints
+	Display string
+	// The location of the error
+	LocationError SourceLocationError
+}