Skip to content

Commit 39576d6

Browse files
kyleconroykyleconroy
authored
fix(mysql): Add, drop, rename and change enum values (sqlc-dev#2853)
Extends the work done in sqlc-dev#2680 to support adding and dropping columns and tables. Fixes sqlc-dev#2475
1 parent b581867 commit 39576d6

29 files changed

Lines changed: 495 additions & 332 deletions

File tree

‎examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/Models.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ package com.example.ondeck.mysql
77
import java.sql.Timestamp
88
import java.time.Instant
99

10-
enum class VenuesStatus(val value: String) {
10+
enum class VenueStatus(val value: String) {
1111
OPEN("open"),
1212
CLOSED("closed");
1313

1414
companion object {
15-
private val map = VenuesStatus.values().associateBy(VenuesStatus::value)
15+
private val map = VenueStatus.values().associateBy(VenueStatus::value)
1616
fun lookup(value: String) = map[value]
1717
}
1818
}
@@ -26,7 +26,7 @@ data class City (
2626
data class Venue (
2727
val id: Long,
2828
// Venues can be either open or closed
29-
val status: VenuesStatus,
29+
val status: VenueStatus,
3030
val statuses: String?,
3131
// This value appears in public URLs
3232
val slug: String,

‎examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/Queries.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface Queries {
2020
name: String,
2121
city: String,
2222
spotifyPlaylist: String,
23-
status: VenuesStatus,
23+
status: VenueStatus,
2424
statuses: String?,
2525
tags: String?): Long
2626

‎examples/kotlin/src/main/kotlin/com/example/ondeck/mysql/QueriesImpl.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class QueriesImpl(private val conn: Connection) : Queries {
116116
name: String,
117117
city: String,
118118
spotifyPlaylist: String,
119-
status: VenuesStatus,
119+
status: VenueStatus,
120120
statuses: String?,
121121
tags: String?): Long {
122122
return conn.prepareStatement(createVenue, Statement.RETURN_GENERATED_KEYS).use { stmt ->
@@ -180,7 +180,7 @@ class QueriesImpl(private val conn: Connection) : Queries {
180180
}
181181
val ret = Venue(
182182
results.getLong(1),
183-
VenuesStatus.lookup(results.getString(2))!!,
183+
VenueStatus.lookup(results.getString(2))!!,
184184
results.getString(3),
185185
results.getString(4),
186186
results.getString(5),
@@ -223,7 +223,7 @@ class QueriesImpl(private val conn: Connection) : Queries {
223223
while (results.next()) {
224224
ret.add(Venue(
225225
results.getLong(1),
226-
VenuesStatus.lookup(results.getString(2))!!,
226+
VenueStatus.lookup(results.getString(2))!!,
227227
results.getString(3),
228228
results.getString(4),
229229
results.getString(5),

‎examples/kotlin/src/test/kotlin/com/example/ondeck/mysql/QueriesImplTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class QueriesImplTest {
2525
name = "The Fillmore",
2626
city = city.slug,
2727
spotifyPlaylist = "spotify=uri",
28-
status = VenuesStatus.OPEN,
29-
statuses = listOf(VenuesStatus.OPEN, VenuesStatus.CLOSED).joinToString(","),
28+
status = VenueStatus.OPEN,
29+
statuses = listOf(VenueStatus.OPEN, VenueStatus.CLOSED).joinToString(","),
3030
tags = listOf("rock", "punk").joinToString(",")
3131
)
3232
val venue = q.getVenue(

‎examples/ondeck/mysql/db_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ func runOnDeckQueries(t *testing.T, q *Queries) {
4545
Name: "The Fillmore",
4646
City: city.Slug,
4747
SpotifyPlaylist: "spotify:uri",
48-
Status: VenuesStatusOpen,
49-
Statuses: join(string(VenuesStatusOpen), string(VenuesStatusClosed)),
48+
Status: VenueStatusOpen,
49+
Statuses: join(string(VenueStatusOpen), string(VenueStatusClosed)),
5050
Tags: join("rock", "punk"),
5151
})
5252
if err != nil {

‎examples/ondeck/mysql/models.go‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/ondeck/mysql/venue.sql.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/enum_alter_change/mysql/go/models.go‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎internal/endtoend/testdata/enum_alter_change/mysql/go/query.sql.go‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎internal/endtoend/testdata/enum_alter_change/mysql/query.sql‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)