From 13ecc2bbb1cac5a3a0e002fec6a4ca3d7b86eb0b Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 3 Jan 2024 15:47:35 -0800 Subject: [PATCH 1/2] test: Upgrade to sqlc v1.25.0 --- examples/src/main/kotlin/com/example/authors/mysql/Models.kt | 2 +- examples/src/main/kotlin/com/example/authors/mysql/Queries.kt | 2 +- .../src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt | 2 +- .../src/main/kotlin/com/example/authors/postgresql/Models.kt | 2 +- .../src/main/kotlin/com/example/authors/postgresql/Queries.kt | 2 +- .../main/kotlin/com/example/authors/postgresql/QueriesImpl.kt | 2 +- examples/src/main/kotlin/com/example/booktest/mysql/Models.kt | 2 +- examples/src/main/kotlin/com/example/booktest/mysql/Queries.kt | 2 +- .../src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt | 2 +- .../src/main/kotlin/com/example/booktest/postgresql/Models.kt | 2 +- .../src/main/kotlin/com/example/booktest/postgresql/Queries.kt | 2 +- .../main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt | 2 +- examples/src/main/kotlin/com/example/jets/Models.kt | 2 +- examples/src/main/kotlin/com/example/jets/Queries.kt | 2 +- examples/src/main/kotlin/com/example/jets/QueriesImpl.kt | 2 +- examples/src/main/kotlin/com/example/ondeck/mysql/Models.kt | 2 +- examples/src/main/kotlin/com/example/ondeck/mysql/Queries.kt | 2 +- .../src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt | 2 +- .../src/main/kotlin/com/example/ondeck/postgresql/Models.kt | 2 +- .../src/main/kotlin/com/example/ondeck/postgresql/Queries.kt | 2 +- .../main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/examples/src/main/kotlin/com/example/authors/mysql/Models.kt b/examples/src/main/kotlin/com/example/authors/mysql/Models.kt index bab85d2..2d7812f 100644 --- a/examples/src/main/kotlin/com/example/authors/mysql/Models.kt +++ b/examples/src/main/kotlin/com/example/authors/mysql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.mysql diff --git a/examples/src/main/kotlin/com/example/authors/mysql/Queries.kt b/examples/src/main/kotlin/com/example/authors/mysql/Queries.kt index 31a464f..8013539 100644 --- a/examples/src/main/kotlin/com/example/authors/mysql/Queries.kt +++ b/examples/src/main/kotlin/com/example/authors/mysql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.mysql diff --git a/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt index bac4446..29edfe7 100644 --- a/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/authors/mysql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.mysql diff --git a/examples/src/main/kotlin/com/example/authors/postgresql/Models.kt b/examples/src/main/kotlin/com/example/authors/postgresql/Models.kt index f1b3b2b..2e42cbd 100644 --- a/examples/src/main/kotlin/com/example/authors/postgresql/Models.kt +++ b/examples/src/main/kotlin/com/example/authors/postgresql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.postgresql diff --git a/examples/src/main/kotlin/com/example/authors/postgresql/Queries.kt b/examples/src/main/kotlin/com/example/authors/postgresql/Queries.kt index 2eeac8f..0726e6e 100644 --- a/examples/src/main/kotlin/com/example/authors/postgresql/Queries.kt +++ b/examples/src/main/kotlin/com/example/authors/postgresql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.postgresql diff --git a/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt index ef19cc6..fe0338a 100644 --- a/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/authors/postgresql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.authors.postgresql diff --git a/examples/src/main/kotlin/com/example/booktest/mysql/Models.kt b/examples/src/main/kotlin/com/example/booktest/mysql/Models.kt index d48beab..ba2b17e 100644 --- a/examples/src/main/kotlin/com/example/booktest/mysql/Models.kt +++ b/examples/src/main/kotlin/com/example/booktest/mysql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.mysql diff --git a/examples/src/main/kotlin/com/example/booktest/mysql/Queries.kt b/examples/src/main/kotlin/com/example/booktest/mysql/Queries.kt index dc0296b..00213f5 100644 --- a/examples/src/main/kotlin/com/example/booktest/mysql/Queries.kt +++ b/examples/src/main/kotlin/com/example/booktest/mysql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.mysql diff --git a/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt index 358d21a..c5ca6e4 100644 --- a/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/booktest/mysql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.mysql diff --git a/examples/src/main/kotlin/com/example/booktest/postgresql/Models.kt b/examples/src/main/kotlin/com/example/booktest/postgresql/Models.kt index 31c7ebf..be8d68e 100644 --- a/examples/src/main/kotlin/com/example/booktest/postgresql/Models.kt +++ b/examples/src/main/kotlin/com/example/booktest/postgresql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.postgresql diff --git a/examples/src/main/kotlin/com/example/booktest/postgresql/Queries.kt b/examples/src/main/kotlin/com/example/booktest/postgresql/Queries.kt index 3a21a7b..f7c5894 100644 --- a/examples/src/main/kotlin/com/example/booktest/postgresql/Queries.kt +++ b/examples/src/main/kotlin/com/example/booktest/postgresql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.postgresql diff --git a/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt index d329ced..8e3f3c3 100644 --- a/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/booktest/postgresql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.booktest.postgresql diff --git a/examples/src/main/kotlin/com/example/jets/Models.kt b/examples/src/main/kotlin/com/example/jets/Models.kt index 7887ce7..35a99dd 100644 --- a/examples/src/main/kotlin/com/example/jets/Models.kt +++ b/examples/src/main/kotlin/com/example/jets/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.jets diff --git a/examples/src/main/kotlin/com/example/jets/Queries.kt b/examples/src/main/kotlin/com/example/jets/Queries.kt index 26c3195..b50a4e3 100644 --- a/examples/src/main/kotlin/com/example/jets/Queries.kt +++ b/examples/src/main/kotlin/com/example/jets/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.jets diff --git a/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt b/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt index 4ecc6c8..5760a0e 100644 --- a/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/jets/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.jets diff --git a/examples/src/main/kotlin/com/example/ondeck/mysql/Models.kt b/examples/src/main/kotlin/com/example/ondeck/mysql/Models.kt index 5331345..c2795d0 100644 --- a/examples/src/main/kotlin/com/example/ondeck/mysql/Models.kt +++ b/examples/src/main/kotlin/com/example/ondeck/mysql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.mysql diff --git a/examples/src/main/kotlin/com/example/ondeck/mysql/Queries.kt b/examples/src/main/kotlin/com/example/ondeck/mysql/Queries.kt index 742f6c3..ed84340 100644 --- a/examples/src/main/kotlin/com/example/ondeck/mysql/Queries.kt +++ b/examples/src/main/kotlin/com/example/ondeck/mysql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.mysql diff --git a/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt index aa97d97..9965de0 100644 --- a/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.mysql diff --git a/examples/src/main/kotlin/com/example/ondeck/postgresql/Models.kt b/examples/src/main/kotlin/com/example/ondeck/postgresql/Models.kt index 4870979..20ae4d4 100644 --- a/examples/src/main/kotlin/com/example/ondeck/postgresql/Models.kt +++ b/examples/src/main/kotlin/com/example/ondeck/postgresql/Models.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.postgresql diff --git a/examples/src/main/kotlin/com/example/ondeck/postgresql/Queries.kt b/examples/src/main/kotlin/com/example/ondeck/postgresql/Queries.kt index f6e093a..a7c6733 100644 --- a/examples/src/main/kotlin/com/example/ondeck/postgresql/Queries.kt +++ b/examples/src/main/kotlin/com/example/ondeck/postgresql/Queries.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.postgresql diff --git a/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt b/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt index 411345c..1519d78 100644 --- a/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt +++ b/examples/src/main/kotlin/com/example/ondeck/postgresql/QueriesImpl.kt @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.24.0 +// sqlc v1.25.0 package com.example.ondeck.postgresql From 96d2ce7b8234691776fb8860628b224d07754e36 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 3 Jan 2024 15:50:09 -0800 Subject: [PATCH 2/2] Make it work? --- .github/workflows/ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 025cdc1..1246bcd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,10 @@ jobs: - uses: actions/setup-go@v4 with: go-version: '1.21' - - uses: sqlc-dev/setup-sqlc@v4 - with: - sqlc-version: '1.24.0' + - run: go install github.com/sqlc-dev/sqlc/cmd/sqlc@883c70a44e3c9e260598ae09034c92b51f2c9129 + # - uses: sqlc-dev/setup-sqlc@v4 + # with: + # sqlc-version: '1.24.0' - run: make - run: sqlc diff working-directory: examples \ No newline at end of file