Skip to content
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

Jump to bottom

Add Postgres JSON function definitions #4590

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Add Postgres JSON function definitions #4590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 19 additions & 3 deletions ...tgresql/src/main/kotlin/app/cash/sqldelight/dialects/postgresql/PostgreSqlTypeResolver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package app.cash.sqldelight.dialects.postgresql

import app.cash.sqldelight.dialect.api.DialectType
import app.cash.sqldelight.dialect.api.IntermediateType
import app.cash.sqldelight.dialect.api.PrimitiveType
import app.cash.sqldelight.dialect.api.PrimitiveType.BLOB
import app.cash.sqldelight.dialect.api.PrimitiveType.BOOLEAN
import app.cash.sqldelight.dialect.api.PrimitiveType.INTEGER
import app.cash.sqldelight.dialect.api.PrimitiveType.REAL
import app.cash.sqldelight.dialect.api.PrimitiveType.TEXT
Expand Down Expand Up @@ -64,7 +64,7 @@ class PostgreSqlTypeResolver(private val parentResolver: TypeResolver) : TypeRes
}
}
jsonDataType != null -> TEXT
booleanDataType != null -> PrimitiveType.BOOLEAN
booleanDataType != null -> BOOLEAN
blobDataType != null -> BLOB
else -> throw IllegalArgumentException("Unknown kotlin type for sql type ${this.text}")
},
Expand Down Expand Up @@ -123,6 +123,22 @@ class PostgreSqlTypeResolver(private val parentResolver: TypeResolver) : TypeRes
"regr_count" -> IntermediateType(BIG_INT).asNullable()
"gen_random_uuid" -> IntermediateType(PostgreSqlType.UUID)
"length", "character_length", "char_length" -> IntermediateType(PostgreSqlType.INTEGER).nullableIf(resolvedType(exprList[0]).javaType.isNullable)
"to_json", "to_jsonb",
"array_to_json", "row_to_json",
"json_build_array", "jsonb_build_array",
"json_build_object", "jsonb_build_object",
"json_object", "jsonb_object",
"json_extract_path", "jsonb_extract_path",
"json_extract_path_text", "jsonb_extract_path_text",
"jsonb_set", "jsonb_set_lax", "jsonb_insert",
"json_strip_nulls", "jsonb_strip_nulls",
"jsonb_path_query_array", "jsonb_path_query_first", "jsonb_path_query_array_tz", "jsonb_path_query_first_tz",
"jsonb_pretty",
"json_typeof", "jsonb_typeof",
"json_agg", "jsonb_agg", "json_object_agg", "jsonb_object_agg",
-> IntermediateType(TEXT)
"json_array_length", "jsonb_array_length" -> IntermediateType(INTEGER)
"jsonb_path_exists", "jsonb_path_match", "jsonb_path_exists_tz", "jsonb_path_match_tz" -> IntermediateType(BOOLEAN)
else -> null
}

Expand Down Expand Up @@ -166,7 +182,7 @@ class PostgreSqlTypeResolver(private val parentResolver: TypeResolver) : TypeRes
private fun SqlExpr.postgreSqlType(): IntermediateType = when (this) {
is SqlBinaryExpr -> {
if (node.findChildByType(binaryExprChildTypesResolvingToBool) != null) {
IntermediateType(PrimitiveType.BOOLEAN)
IntermediateType(BOOLEAN)
} else {
encapsulatingType(
exprList = getExprList(),
Expand Down
13 changes: 13 additions & 0 deletions ...gration-postgresql/src/main/sqldelight/app/cash/sqldelight/postgresql/integration/Json.sq
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
CREATE TABLE myJson(
data JSON NOT NULL,
datab JSONB NOT NULL
);

insert:
INSERT INTO myJson(data, datab) VALUES(
json_build_object(:key, :value),
jsonb_build_object('key', 'value')
);

buildJson:
SELECT json_build_object('key', 'value'), jsonb_build_object('key', 'value');