@contember/engine-content-api 1.1.0-alpha.8 → 1.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "1.1.0-alpha.8",
+  "version": "1.1.0-beta.2",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -10,19 +10,19 @@
     "test": "vitest --no-threads"
   },
   "dependencies": {
-    "@contember/database": "^1.1.0-alpha.8",
-    "@contember/dic": "^1.1.0-alpha.8",
-    "@contember/engine-common": "^1.1.0-alpha.8",
-    "@contember/graphql-utils": "^1.1.0-alpha.8",
-    "@contember/schema": "^1.1.0-alpha.8",
-    "@contember/schema-utils": "^1.1.0-alpha.8",
+    "@contember/database": "^1.1.0-beta.2",
+    "@contember/dic": "^1.1.0-beta.2",
+    "@contember/engine-common": "^1.1.0-beta.2",
+    "@contember/graphql-utils": "^1.1.0-beta.2",
+    "@contember/schema": "^1.1.0-beta.2",
+    "@contember/schema-utils": "^1.1.0-beta.2",
     "@graphql-tools/schema": "^8.3.5",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "^1.1.0-alpha.8",
-    "@contember/engine-api-tester": "^1.1.0-alpha.8",
-    "@contember/schema-definition": "^1.1.0-alpha.8",
+    "@contember/database-tester": "^1.1.0-beta.2",
+    "@contember/engine-api-tester": "^1.1.0-beta.2",
+    "@contember/schema-definition": "^1.1.0-beta.2",
     "@graphql-codegen/cli": "^1.15.2",
     "@graphql-codegen/typescript": "^1.15.2",
     "@graphql-codegen/typescript-operations": "^1.15.2",

package/src/mapper/select/ConditionBuilder.ts

@@ -7,6 +7,7 @@ export class ConditionBuilder {
 		builder: SqlConditionBuilder,
 		tableName: string,
 		columnName: string,
+		columnType: string,
 		condition: Input.Condition<any>,
 	): SqlConditionBuilder {
 		const keys = Object.keys(condition) as (keyof Required<Input.Condition<any>>)[]
@@ -27,13 +28,13 @@ export class ConditionBuilder {
 				param: Exclude<Input.Condition<any>[K], undefined>,
 			) => SqlConditionBuilder
 		} = {
-			and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
-			or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, expr), builder2)),
-			not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, expression)),
+			and: (builder, expressions) => builder.and(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
+			or: (builder, expressions) => builder.or(builder2 => expressions.reduce((builder3, expr) => this.build(builder3, tableName, columnName, columnType, expr), builder2)),
+			not: (builder, expression) => builder.not(builder2 => this.build(builder2, tableName, columnName, columnType, expression)),
 			eq: (builder, value) => builder.compare(columnIdentifier, Operator.eq, value),
 			notEq: (builder, value) => builder.compare(columnIdentifier, Operator.notEq, value),
 			isNull: (builder, value) => value ? builder.isNull(columnIdentifier) : builder.not(clause => clause.isNull(columnIdentifier)),
-			in: (builder, values) => builder.in(columnIdentifier, values),
+			in: (builder, values) => builder.in(columnIdentifier, values, columnType),
 			notIn: (builder, values) => builder.not(builder2 => builder2.in(columnIdentifier, values)),
 			lt: (builder, value) => builder.compare(columnIdentifier, Operator.lt, value),
 			lte: (builder, value) => builder.compare(columnIdentifier, Operator.lte, value),

package/src/mapper/select/WhereBuilder.ts

@@ -101,6 +101,7 @@ export class WhereBuilder {
 							conditionBuilder,
 							tableName,
 							relation.joiningColumn.columnName,
+							(targetEntity.fields[targetEntity.primary] as Model.AnyColumn).columnType,
 							primaryCondition,
 						)
 					}
@@ -114,7 +115,7 @@ export class WhereBuilder {
 			conditionBuilder = acceptFieldVisitor<SqlConditionBuilder>(this.schema, entity, fieldName, {
 				visitColumn: (entity, column) => {
 					const subWhere: Input.Condition<Input.ColumnValue> = where[column.name] as Input.Condition<Input.ColumnValue>
-					return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, subWhere)
+					return this.conditionBuilder.build(conditionBuilder, tableName, column.columnName, column.columnType, subWhere)
 				},
 				visitOneHasOneInverse: joinedWhere,
 				visitOneHasOneOwning: joinedWhere,
@@ -194,8 +195,10 @@ export class WhereBuilder {
 		const primaryCondition = this.transformWhereToPrimaryCondition(relationWhere, targetEntity.primary)
 		if (primaryCondition !== null) {
 
+			const columnType = (targetEntity.fields[targetEntity.primary] as Model.AnyColumn).columnType
+
 			return qb.where(condition =>
-				this.conditionBuilder.build(condition, 'junction_', toColumn, primaryCondition),
+				this.conditionBuilder.build(condition, 'junction_', toColumn, columnType, primaryCondition),
 			)
 		}