Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will build a golang project
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go

name: go-querysql-test
name: sqlcode

on:
pull_request:
Expand All @@ -11,19 +11,16 @@ jobs:

build:
runs-on: ubuntu-latest
env:
SQLSERVER_DSN: "sqlserver://127.0.0.1:1433?database=master&user id=sa&password=VippsPw1"
strategy:
matrix:
driver: ['mssql']
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.23'

- name: Start db
run: docker compose -f docker-compose.test.yml up -d
go-version: '1.25'

- name: Test
# Skip the example folder because it has examples of what-not-to-do
run: go test -v $(go list ./... | grep -v './example')
run: docker compose -f docker-compose.${{ matrix.driver }}.yml run test
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
test: test-mssql

.PHONY:
test-mssql:
docker compose --progress plain -f docker-compose.mssql.yml run test
29 changes: 29 additions & 0 deletions docker-compose.mssql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
services:
mssql:
image: mcr.microsoft.com/mssql/server:latest
networks:
- mssql
environment:
ACCEPT_EULA: "Y"
SA_PASSWORD: VippsPw1
healthcheck:
test: ["CMD", "/opt/mssql-tools18/bin/sqlcmd", "-C", "-Usa", "-PVippsPw1", "-Q", "select 1"]
interval: 1s
retries: 20
test:
build:
no_cache: true
context: .
dockerfile: dockerfile.test
networks:
- mssql
volumes:
- $PWD:/sqlcode
environment:
SQLSERVER_DSN: sqlserver://mssql:1433?database=master&user id=sa&password=VippsPw1
GODEBUG: "x509negativeserial=1"
depends_on:
mssql:
condition: service_healthy
networks:
mssql:
15 changes: 0 additions & 15 deletions docker-compose.test.yml

This file was deleted.

5 changes: 5 additions & 0 deletions dockerfile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM golang:1.25 AS builder
WORKDIR /sqlcode
COPY . .
RUN go mod tidy
CMD ["go", "test", "-v", "-cover", "./..."]
3 changes: 3 additions & 0 deletions example/basic/example.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
//go:build examples
// +build examples

package example

import (
Expand Down
8 changes: 6 additions & 2 deletions example/basic/example_test.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
//go:build examples
// +build examples

package example

import (
"context"
"fmt"
"testing"
"time"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/vippsas/sqlcode/sqltest"
"testing"
"time"
)

func TestPreprocess(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions sqlcode.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
databases:
localtest:
connection: sqlserver://localhost:1433?database=foo&user id=foouser&password=FooPasswd1
mssql:
connection: sqlserver://mssql:1433?database=foo&user id=foouser&password=FooPasswd1

# One option is to list other paths to include ('dependencies') here.

Expand Down