Skip to content

Commit

Permalink
Add support for identity columns (fix #78)
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindberg committed Dec 31, 2023
1 parent 3367e40 commit fbab52c
Show file tree
Hide file tree
Showing 53 changed files with 1,464 additions and 64 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import scala.util.Try
import testdb.hardcoded.Text

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -35,10 +36,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import scala.util.Try
import testdb.hardcoded.Text

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -35,10 +36,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import scala.util.Try
import testdb.hardcoded.Text

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -35,10 +36,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import io.circe.Encoder
import java.sql.ResultSet

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import io.circe.Encoder
import java.sql.ResultSet

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import io.circe.Encoder
import java.sql.ResultSet

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import testdb.hardcoded.myschema.football_club.FootballClubId
import testdb.hardcoded.myschema.marital_status.MaritalStatusId

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
one: Long,
/** Default: auto-increment */
two: Option[String],
name: Option[String]
){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import zio.json.ast.Json
import zio.json.internal.Write

case class PersonRow(
/** Default: auto-increment */
id: PersonId,
/** Points to [[football_club.FootballClubRow.id]] */
favouriteFootballClubId: FootballClubId,
Expand All @@ -30,10 +31,13 @@ case class PersonRow(
email: /* max 254 chars */ String,
phone: /* max 8 chars */ String,
likesPizza: Boolean,
/** Points to [[marital_status.MaritalStatusRow.id]] */
/** Default: some-value
Points to [[marital_status.MaritalStatusRow.id]] */
maritalStatusId: MaritalStatusId,
workEmail: Option[/* max 254 chars */ String],
/** Default: PUBLIC */
sector: Sector,
/** Default: one */
favoriteNumber: Number
)

Expand Down
9 changes: 8 additions & 1 deletion init/data/test-tables.sql
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,11 @@ CREATE TABLE users
verified_on TIMESTAMPTZ NULL,
CONSTRAINT users_user_id_pk PRIMARY KEY (user_id),
CONSTRAINT users_email_unique UNIQUE (email)
);
);

CREATE TABLE "identity-test"
(
always_generated Integer NOT NULL GENERATED ALWAYS AS IDENTITY (INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1),
default_generated Integer NOT NULL GENERATED BY DEFAULT AS IDENTITY (INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1),
name Character varying(250) NOT NULL primary key
);
Loading

0 comments on commit fbab52c

Please sign in to comment.