diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82069c3..34a2f8d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: name: Build strategy: matrix: - go: [1.15, 1.16, 1.17, 1.18, 1.19] + go: [1.17, 1.18, 1.19, '1.20'] runs-on: ubuntu-latest steps: - name: Set up Go 1.x @@ -25,7 +25,7 @@ jobs: run: go test -race ./... - name: Coverage run: go test -race -coverprofile=coverage.txt -covermode=atomic ./... - if: matrix.go == 1.19 && matrix.os == 'ubuntu-latest' + if: matrix.go == 1.20 && matrix.os == 'ubuntu-latest' - name: Codecov uses: codecov/codecov-action@v1 - if: matrix.go == 1.19 && matrix.os == 'ubuntu-latest' + if: matrix.go == 1.20 && matrix.os == 'ubuntu-latest' diff --git a/go.mod b/go.mod index 15cba9a..fb6874a 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ module github.com/go-rel/sqlite3 -go 1.19 +go 1.20 require ( github.com/go-rel/rel v0.39.0 - github.com/go-rel/sql v0.13.1 + github.com/go-rel/sql v0.14.0 github.com/mattn/go-sqlite3 v1.14.17 - github.com/stretchr/testify v1.8.3 + github.com/stretchr/testify v1.8.4 ) require ( diff --git a/go.sum b/go.sum index 7815142..099d1ce 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/go-rel/rel v0.39.0 h1:2zmK8kazM82iRRfWX7+mm1MxDkGKDj2W+xJLjguli5U= github.com/go-rel/rel v0.39.0/go.mod h1:yN6+aimHyRIzbuWFe5DaxiZPuVuPfd7GlLpy/YTqTUg= -github.com/go-rel/sql v0.13.1 h1:Q3G9/QyK4p7AIDNviW0x3JrfdG5LyoLrGH9uoaUtA+o= -github.com/go-rel/sql v0.13.1/go.mod h1:3t/E+2E/Y9rXURDD7ZMgpFdXLji10gP7gb57HeoaRNY= +github.com/go-rel/sql v0.14.0 h1:pTg40wvSrOr9cNcm76mHqPe0oRg6CRf92xfH6A3+y/g= +github.com/go-rel/sql v0.14.0/go.mod h1:gtbpaNkNDNrf9LceaDWhAr6Im+Vd2NgBT93AOOM6UOc= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM= @@ -17,8 +17,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e h1:zWKUYT07mGmVBH+9UgnHXd/ekCK99C8EbDSAt5qsjXE= github.com/serenize/snaker v0.0.0-20201027110005-a7ad2135616e/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= -github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= diff --git a/sqlite3.go b/sqlite3.go index 9d44f96..6668114 100644 --- a/sqlite3.go +++ b/sqlite3.go @@ -1,6 +1,7 @@ // Package sqlite3 wraps go-sqlite3 driver as an adapter for rel. // // Usage: +// // // open sqlite3 connection. // adapter, err := sqlite3.Open("dev.db") // if err != nil { @@ -35,7 +36,7 @@ func New(database *db.DB) rel.Adapter { deleteBuilder = builder.Delete{BufferFactory: bufferFactory, Query: queryBuilder, Filter: filterBuilder} ddlBufferFactory = builder.BufferFactory{InlineValues: true, BoolTrueValue: "1", BoolFalseValue: "0", Quoter: builder.Quote{IDPrefix: "\"", IDSuffix: "\"", IDSuffixEscapeChar: "\"", ValueQuote: "'", ValueQuoteEscapeChar: "'"}} ddlQueryBuilder = builder.Query{BufferFactory: ddlBufferFactory, Filter: filterBuilder} - tableBuilder = builder.Table{BufferFactory: ddlBufferFactory, ColumnMapper: columnMapper, DefinitionFilter: definitionFilter} + tableBuilder = builder.Table{BufferFactory: ddlBufferFactory, ColumnMapper: columnMapper, DefinitionFilter: definitionFilter, DropKeyMapper: sql.DropKeyMapper} indexBuilder = builder.Index{BufferFactory: ddlBufferFactory, Query: ddlQueryBuilder, Filter: filterBuilder, SupportFilter: true} )