- Elegant re-include sqlite3 mathematical functions.

general-kroll-4-life · general-kroll-4-life · commit cbf0621913a2 · 2025-01-27T14:43:49.000+11:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ on:
       - ".github/workflows/scenario.yaml"
 
 env:
-  GOTESTCMD: "go test -timeout 1200s --tags \"sqlite_stackql sqlite_math_functions\" -v ./..."
+  GOTESTCMD: "go test -timeout 1200s --tags \"sqlite_stackql\" -v ./..."
   TESTSCRIPT: "test/python/main.py"
   GOPRIVATE: github.com/stackql/*
   GH_ACCESS_TOKEN: ${{ secrets.ACTIONS_PRIVATE_PACKAGE_SECRET }}
@@ -313,7 +313,7 @@ jobs:
         baselineRefFile="cicd/ref/bench/baseline-go-bench.log"
         thresholdRefFile="cicd/ref/bench/max-threshold-go-bench.log"
         go test -run='^$' -bench . -benchtime=100x -count=6 \
-          --tags "sqlite_stackql sqlite_math_functions" --ldflags "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=false"  \
+          --tags "sqlite_stackql" --ldflags "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=false"  \
           ./... | tee ${outFile}
         # shellcheck disable=SC2181
         if [ "$?" = "0" ]; then
@@ -569,7 +569,7 @@ jobs:
         baselineRefFile="cicd/ref/bench/baseline-go-bench.log"
         thresholdRefFile="cicd/ref/bench/max-threshold-go-bench.log"
         go test -run='^$' -bench . -benchtime=100x -count=6 \
-          --tags "sqlite_stackql sqlite_math_functions" --ldflags "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=false"  \
+          --tags "sqlite_stackql" --ldflags "-X stackql/internal/stackql/planbuilder.PlanCacheEnabled=false"  \
           ./... | tee ${outFile}
         # shellcheck disable=SC2181
         if [ "$?" = "0" ]; then
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -198,9 +198,9 @@
       "type": "pickString",
       "id": "buildFlags",
       "description": "Extra Build Flags for debug; cannot place elsewhere",
-      "default": "-tags=sqlite_stackql sqlite_math_functions",
+      "default": "-tags=sqlite_stackql",
       "options": [
-        "-tags=sqlite_stackql sqlite_math_functions"
+        "-tags=sqlite_stackql"
       ]
     },
     {
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,9 +10,9 @@
   "editor.insertSpaces": true,
   "cmake.configureOnOpen": false,
   "go.buildFlags": [
-    "-tags=sqlite_stackql sqlite_math_functions"
+    "-tags=sqlite_stackql"
   ],
-  "go.testTags": "sqlite_stackql sqlite_math_functions",
+  "go.testTags": "sqlite_stackql",
   "todohighlight.keywordsPattern": "TODO:|FIXME:|BLOCK|END_BLOCK", //highlight `TODO:`,`FIXME:` or commented content between parentheses
   "todohighlight.exclude": [
     "**/*.json"
diff --git a/Dockerfile b/Dockerfile
@@ -44,7 +44,7 @@ ENV SRC_DIR=/work/stackql/src
 ENV BUILD_DIR=/work/stackql/build
 
 RUN   cd ${SRC_DIR} \
-      && go test --tags "sqlite_stackql sqlite_math_functions" ./... \
+      && go test --tags "sqlite_stackql" ./... \
       && go build -ldflags "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion=$BUILDMAJORVERSION \
           -X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion=$BUILDMINORVERSION \
           -X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion=$BUILDPATCHVERSION \
@@ -53,7 +53,7 @@ RUN   cd ${SRC_DIR} \
           -X \"github.com/stackql/stackql/internal/stackql/cmd.BuildDate=$BUILDDATE\" \
           -X \"stackql/internal/stackql/planbuilder.PlanCacheEnabled=$PLANCACHEENABLED\" \
           -X github.com/stackql/stackql/internal/stackql/cmd.BuildPlatform=$BUILDPLATFORM" \
-        --tags "sqlite_stackql sqlite_math_functions" \
+        --tags "sqlite_stackql" \
         -o ${BUILD_DIR}/stackql ./stackql
 
 FROM python:3.11-bullseye AS utility
diff --git a/cicd/python/build.py b/cicd/python/build.py
@@ -13,7 +13,7 @@ def build_stackql(verbose :bool) -> int:
     os.environ['BUILDPATCHVERSION'] = os.environ.get('BUILDPATCHVERSION', '1')
     os.environ['CGO_ENABLED'] = os.environ.get('CGO_ENABLED', '1')
     return subprocess.call(
-        f'go build {"-x -v" if verbose else ""} --tags "sqlite_stackql sqlite_math_functions" -ldflags "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion={os.environ.get("BUILDMAJORVERSION")} '
+        f'go build {"-x -v" if verbose else ""} --tags "sqlite_stackql" -ldflags "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion={os.environ.get("BUILDMAJORVERSION")} '
         f'-X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion={os.environ.get("BUILDMINORVERSION")} '
         f'-X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion={os.environ.get("BUILDPATCHVERSION")} '
         f'-X github.com/stackql/stackql/internal/stackql/cmd.BuildCommitSHA={os.environ.get("BUILDCOMMITSHA", "")} '
@@ -28,7 +28,7 @@ def build_stackql(verbose :bool) -> int:
 
 def unit_test_stackql(verbose :bool) -> int:
     return subprocess.call(
-        f'go test -timeout 1200s {"-v" if verbose else ""} --tags "sqlite_stackql sqlite_math_functions"  ./...',
+        f'go test -timeout 1200s {"-v" if verbose else ""} --tags "sqlite_stackql"  ./...',
         shell=True
     )
 
diff --git a/docs/developer_guide.md b/docs/developer_guide.md
@@ -49,7 +49,7 @@ As of now, `stackql` handles `xml` SERDE through the core, and does not route th
 
 ```bash
 env CGO_ENABLED=1 go build \
-  --tags "sqlite_stackql sqlite_math_functions" \
+  --tags "sqlite_stackql" \
   -ldflags "-X github.com/stackql/stackql/internal/stackql/cmd.BuildMajorVersion=${BUILDMAJORVERSION:-1} \
   -X github.com/stackql/stackql/internal/stackql/cmd.BuildMinorVersion=${BUILDMINORVERSION:-1} \
   -X github.com/stackql/stackql/internal/stackql/cmd.BuildPatchVersion=${BUILDPATCHVERSION:-1} \
@@ -69,7 +69,7 @@ At this time, we are not dogmatic about how to implement unit tests.  Aspiration
 To run all unit tests:
 
 ```bash
-go test -timeout 1200s --tags "sqlite_stackql sqlite_math_functions" ./...
+go test -timeout 1200s --tags "sqlite_stackql" ./...
 ```
 
 ### Robot tests
@@ -184,7 +184,7 @@ Requirements are [detailed in the root README](/README.md#system-requirements).
 
 Local testing of the application:
 
-1. Run `go test --tags "sqlite_stackql sqlite_math_functions" ./...` tests.
+1. Run `go test --tags "sqlite_stackql" ./...` tests.
 2. Build the executable [as per the root README](/README.md#build)
 3. Perform registry rewrites as needed for mocking `python3 test/python/registry-rewrite.py`.
 3. Run robot tests:
@@ -203,7 +203,7 @@ Test coverage is sparse.  Regressions are mitigated by `go test` integration tes
 #### Point in time gotest coverage
 
 If not already done, then install 'cover' with `go get golang.org/x/tools/cmd/cover`.  
-Then: `go test --tags "sqlite_stackql sqlite_math_functions" -cover ../...`.
+Then: `go test --tags "sqlite_stackql" -cover ../...`.
 
 ### Functional and Integration testing
 
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/jackc/pgx/v5 v5.0.4
 	github.com/lib/pq v1.10.4
 	github.com/magiconair/properties v1.8.6
-	github.com/mattn/go-sqlite3 v1.0.2-stackql
+	github.com/mattn/go-sqlite3 v1.0.3-stackql
 	github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4
 	github.com/sirupsen/logrus v1.9.0
 	github.com/snowflakedb/gosnowflake v1.6.16
@@ -130,4 +130,4 @@ require (
 
 replace github.com/chzyer/readline => github.com/stackql/readline v0.0.2-alpha05
 
-replace github.com/mattn/go-sqlite3 => github.com/stackql/stackql-go-sqlite3 v1.0.2-stackql
+replace github.com/mattn/go-sqlite3 => github.com/stackql/stackql-go-sqlite3 v1.0.3-stackql
diff --git a/go.sum b/go.sum
@@ -490,8 +490,8 @@ github.com/stackql/psql-wire v0.1.1-alpha07 h1:LQWVUlx4Bougk6dztDNG5tmXxpIVeeTSs
 github.com/stackql/psql-wire v0.1.1-alpha07/go.mod h1:a44Wd8kDC3irFLpGutarKDBqhJ/aqXlj1aMzO5bVJYg=
 github.com/stackql/readline v0.0.2-alpha05 h1:ID4QzGdplFBsrSnTuz8pvKzWw96JbrJg8fsLry2UriU=
 github.com/stackql/readline v0.0.2-alpha05/go.mod h1:OFAYOdXk/X4+5GYiDXFfaGrk+bCN6Qv0SYY5HNzD2E0=
-github.com/stackql/stackql-go-sqlite3 v1.0.2-stackql h1:HyctYfBzMth/fIs2Y+9c/SICsCvR/DEnzcI7VZgwGZo=
-github.com/stackql/stackql-go-sqlite3 v1.0.2-stackql/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/stackql/stackql-go-sqlite3 v1.0.3-stackql h1:j0yt6T5thZuz5+HIr81PXz2AClAtCko0vzr5tm8C1g8=
+github.com/stackql/stackql-go-sqlite3 v1.0.3-stackql/go.mod h1:HemqCrcMK2xyhMMMt6oZ7ERDtoSmyyDsw5LBBcTZ+Rk=
 github.com/stackql/stackql-parser v0.0.14-alpha04 h1:CmZUDWf2jBbU+Zu3sdiuM5CwUBFGN/IFjzXPcu46xjs=
 github.com/stackql/stackql-parser v0.0.14-alpha04/go.mod h1:iyB47SvRS+Fvpn7joF7mHAkeiWSq83TbUhglRmLzPLQ=
 github.com/stackql/stackql-provider-registry v0.0.1-rc06 h1:MgroWOr0bSqjSTDGnXB0UoZGFXpW3SRtN0EFkzB8Rpo=

Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,9 @@`
`198`	`198`	`"type": "pickString",`
`199`	`199`	`"id": "buildFlags",`
`200`	`200`	`"description": "Extra Build Flags for debug; cannot place elsewhere",`
`201`		`- "default": "-tags=sqlite_stackql sqlite_math_functions",`
	`201`	`+ "default": "-tags=sqlite_stackql",`
`202`	`202`	`"options": [`
`203`		`- "-tags=sqlite_stackql sqlite_math_functions"`
	`203`	`+ "-tags=sqlite_stackql"`
`204`	`204`	`]`
`205`	`205`	`},`
`206`	`206`	`{`