@contember/engine-content-api 2.1.0-alpha.26 → 2.1.0-alpha.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.1.0-alpha.26",
+  "version": "2.1.0-alpha.27",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",

package/src/mapper/select/ConditionBuilder.ts

@@ -50,11 +50,17 @@ export class ConditionBuilder {
 			gte: (builder, value) => builder.compare(columnIdentifier, Operator.gte, value),
 
 			includes: (builder, value) => {
-				const cast = columnType.type === Model.ColumnType.Enum
-					? `${Compiler.SCHEMA_PLACEHOLDER}."${columnType.columnType}"`
-					: columnType.columnType
+				if (columnType.type === Model.ColumnType.Json) {
+					// For JSON columns, use @> operator to check if JSON contains the value
+					return builder.raw(`${formatColumnIdentifier(columnIdentifier)} @> ?::jsonb`, JSON.stringify(value))
+				} else {
+					// For array columns, use @> operator with array casting
+					const cast = columnType.type === Model.ColumnType.Enum
+						? `${Compiler.SCHEMA_PLACEHOLDER}."${columnType.columnType}"`
+						: columnType.columnType
 
-				return builder.raw(`${formatColumnIdentifier(columnIdentifier)} @> ARRAY[?]::${cast}[]`, value)
+					return builder.raw(`${formatColumnIdentifier(columnIdentifier)} @> ARRAY[?]::${cast}[]`, value)
+				}
 			},
 			maxLength: (builder, value) => builder.raw(`array_length(${formatColumnIdentifier(columnIdentifier)}, 1) <= ?`, value),
 			minLength: (builder, value) => builder.raw(`array_length(${formatColumnIdentifier(columnIdentifier)}, 1) >= ?`, value),

package/src/schema/ConditionTypeProvider.ts

@@ -60,6 +60,9 @@ export class ConditionTypeProvider {
 						conditions.lte = { type: type }
 						conditions.gt = { type: type }
 						conditions.gte = { type: type }
+					} else {
+						// For JSON columns, add the includes operator
+						conditions.includes = { type: type }
 					}
 					if (column.type === Model.ColumnType.String) {
 						conditions.contains = { type: GraphQLString }

package/tests/cases/integration/graphQlSchema/schema-column-types.gql

@@ -204,6 +204,7 @@ input JsonCondition {
   not: JsonCondition
   null: Boolean
   isNull: Boolean
+  includes: Json
 }
 
 input TimeCondition {