8000 feat(typegen): generate types for columns with json_schema constraint by phmasek · Pull Request #814 · supabase/postgres-meta · GitHub
[go: up one dir, main page]
Skip to content

feat(typegen): generate types for columns with json_schema constraint #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat(typegen): generate types for columns with json_schema constraint #814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
265f8b4
feat(typegen): generate types for columns with json_schema constraint
phmasek Oct 23, 2024
610692b
chore: constraint generate types function to only string
phmasek Oct 23, 2024
7f3f465
chore: additional test case to test other check constraint
phmasek Oct 23, 2024
b8870dd
refactor: disable formatting to increase performance, handled elsewhere
phmasek Oct 23, 2024
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
Prev Previous commit
Next Next commit
chore: additional test case to test other check constraint
  • Loading branch information
@phmasek
phmasek committed Oct 23, 2024
commit 7f3f465f05407b4a0bd1f221a0455923c0f3569a
6 changes: 6 additions & 0 deletions test/db/01-memes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ CREATE TABLE public.memes (
name text NOT NULL,
category INTEGER REFERENCES category(id),
metadata jsonb,
other_check_metadata jsonb,
json_metadata json,
free_metadata jsonb,
created_at TIMESTAMP NOT NULL,
Expand Down Expand Up @@ -84,6 +85,11 @@ CHECK (
}', metadata))
);

ALTER TABLE public.memes ADD CONSTRAINT other_check_metadata_schema_check
CHECK (
(other_check_metadata <> '{}'::jsonb)
);

INSERT INTO public.memes (name, category, created_at) VALUES
('NO. Rage Face', 5, NOW()),
('"Not Bad" Obama Face', 5, NOW()),
Expand Down
72 changes: 48 additions & 24 deletions test/server/typegen.ts
View file
8000 Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ test('typegen: typescript', async () => {
free_metadata: Json | null
id: number
name: string
other_check_metadata: Json | null
status: Database["public"]["Enums"]["meme_status"] | null
json_metadata:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand All @@ -75,6 +76,7 @@ test('typegen: typescript', async () => {
free_metadata?: Json | null
id?: number
name: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand All @@ -89,6 +91,7 @@ test('typegen: typescript', async () => {
free_metadata?: Json | null
id?: number
name?: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand Down Expand Up @@ -642,6 +645,7 @@ test('typegen w/ one-to-one relationships', async () => {
free_metadata: Json | null
id: number
name: string
other_check_metadata: Json | null
status: Database["public"]["Enums"]["meme_status"] | null
json_metadata:
| Database["public"]["SchemaTypes"]["memes&quo 10000 t;]["json_metadata"]
Expand All @@ -656,6 +660,7 @@ test('typegen w/ one-to-one relationships', async () => {
free_metadata?: Json | null
id?: number
name: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand All @@ -670,6 +675,7 @@ test('typegen w/ one-to-one relationships', async () => {
free_metadata?: Json | null
id?: number
name?: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand Down Expand Up @@ -1236,6 +1242,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
free_metadata: Json | null
id: number
name: string
other_check_metadata: Json | null
status: Database["public"]["Enums"]["meme_status"] | null
json_metadata:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand All @@ -1250,6 +1257,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
free_metadata?: Json | null
id?: number
name: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand All @@ -1264,6 +1272,7 @@ test('typegen: typescript w/ one-to-one relationships', async () => {
free_metadata?: Json | null
id?: number
name?: string
other_check_metadata?: Json | null
status?: Database["public"]["Enums"]["meme_status"] | null
json_metadata?:
| Database["public"]["SchemaTypes"]["memes"]["json_metadata"]
Expand Down Expand Up @@ -1903,36 +1912,39 @@ test('typegen: go', async () => {
}

type PublicMemesSelect struct {
Category sql.NullInt32 \`json:"category"\`
CreatedAt string \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id int32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name string \`json:"name"\`
Status sql.NullString \`json:"status"\`
Category sql.NullInt32 \`json:"category"\`
CreatedAt string \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id int32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name string \`json:"name"\`
OtherCheckMetadata interface{} \`json:"other_check_metadata"\`
Status sql.NullString \`json:"status"\`
}

type PublicMemesInsert struct {
Category sql.NullInt32 \`json:"category"\`
CreatedAt string \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id sql.NullInt32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name string \`json:"name"\`
Status sql.NullString \`json:"status"\`
Category sql.NullInt32 \`json:"category"\`
CreatedAt string \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id sql.NullInt32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name string \`json:"name"\`
OtherCheckMetadata interface{} \`json:"other_check_metadata"\`
Status sql.NullString \`json:"status"\`
}

type PublicMemesUpdate struct {
Category sql.NullInt32 \`json:"category"\`
CreatedAt sql.NullString \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id sql.NullInt32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name sql.NullString \`json:"name"\`
Status sql.NullString \`json:"status"\`
Category sql.NullInt32 \`json:"category"\`
CreatedAt sql.NullString \`json:"created_at"\`
FreeMetadata interface{} \`json:"free_metadata"\`
Id sql.NullInt32 \`json:"id"\`
JsonMetadata interface{} \`json:"json_metadata"\`
Metadata interface{} \`json:"metadata"\`
Name sql.NullString \`json:"name"\`
OtherCheckMetadata interface{} \`json:"other_check_metadata"\`
Status sql.NullString \`json:"status"\`
}

type PublicTodosViewSelect struct {
Expand Down Expand Up @@ -2047,6 +2059,7 @@ test('typegen: swift', async () => {
internal let jsonMetadata: AnyJSON?
internal let metadata: AnyJSON?
internal let name: String
internal let otherCheckMetadata: AnyJSON?
internal let status: MemeStatus?
internal enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2056,6 +2069,7 @@ test('typegen: swift', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand All @@ -2067,6 +2081,7 @@ test('typegen: swift', async () => {
internal let jsonMetadata: AnyJSON?
internal let metadata: AnyJSON?
internal let name: String
internal let otherCheckMetadata: AnyJSON?
internal let status: MemeStatus?
internal enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2076,6 +2091,7 @@ test('typegen: swift', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand All @@ -2087,6 +2103,7 @@ test('typegen: swift', async () => {
internal let jsonMetadata: AnyJSON?
internal let metadata: AnyJSON?
internal let name: String?
internal let otherCheckMetadata: AnyJSON?
internal let status: MemeStatus?
internal enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2096,6 +2113,7 @@ test('typegen: swift', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand Down Expand Up @@ -2404,6 +2422,7 @@ test('typegen: swift w/ public access control', async () => {
public let jsonMetadata: AnyJSON?
public let metadata: AnyJSON?
public let name: String
public let otherCheckMetadata: AnyJSON?
public let status: MemeStatus?
public enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2413,6 +2432,7 @@ test('typegen: swift w/ public access control', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand All @@ -2424,6 +2444,7 @@ test('typegen: swift w/ public access control', async () => {
public let jsonMetadata: AnyJSON?
public let metadata: AnyJSON?
public let name: String
public let otherCheckMetadata: AnyJSON?
public let status: MemeStatus?
public enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2433,6 +2454,7 @@ test('typegen: swift w/ public access control', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand All @@ -2444,6 +2466,7 @@ test('typegen: swift w/ public access control', async () => {
public let jsonMetadata: AnyJSON?
public let metadata: AnyJSON?
public let name: String?
public let otherCheckMetadata: AnyJSON?
public let status: MemeStatus?
public enum CodingKeys: String, CodingKey {
case category = "category"
Expand All @@ -2453,6 +2476,7 @@ test('typegen: swift w/ public access control', async () => {
case jsonMetadata = "json_metadata"
case metadata = "metadata"
case name = "name"
case otherCheckMetadata = "other_check_metadata"
case status = "status"
}
}
Expand Down
0