@balena/pinejs 15.0.0-build-renovate-node-20-x-74a72cbe8a4965e32762ac3eb5a13a9720d8740c-1 → 15.0.0-build-15-x-cefa3a481a667c40b8e5dcacdc5699b37977b8d4-1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/pinejs",
-  "version": "15.0.0-build-renovate-node-20-x-74a72cbe8a4965e32762ac3eb5a13a9720d8740c-1",
+  "version": "15.0.0-build-15-x-cefa3a481a667c40b8e5dcacdc5699b37977b8d4-1",
   "main": "out/server-glue/module",
   "repository": "git@github.com:balena-io/pinejs.git",
   "license": "Apache-2.0",
@@ -24,14 +24,14 @@
     "prettify": "balena-lint -e js -e ts --fix src build typings Gruntfile.ts"
   },
   "dependencies": {
-    "@balena/abstract-sql-compiler": "^8.5.0",
-    "@balena/abstract-sql-to-typescript": "^1.5.1",
+    "@balena/abstract-sql-compiler": "9.0.0-build-8-x-374bc5bd42c3caac5c68608f802302674a511c23-1",
+    "@balena/abstract-sql-to-typescript": "2.0.0-build-2-x-b82285a22630389083930647580e89c60c657474-1",
     "@balena/env-parsing": "^1.1.5",
     "@balena/lf-to-abstract-sql": "^5.0.0",
-    "@balena/odata-parser": "^2.5.0",
-    "@balena/odata-to-abstract-sql": "^5.9.6",
+    "@balena/odata-parser": "^3.0.0",
+    "@balena/odata-to-abstract-sql": "^6.0.1",
     "@balena/sbvr-parser": "^1.4.3",
-    "@balena/sbvr-types": "^3.5.0",
+    "@balena/sbvr-types": "^4.0.0",
     "@types/body-parser": "^1.19.2",
     "@types/compression": "^1.7.2",
     "@types/cookie-parser": "^1.4.3",
@@ -71,7 +71,7 @@
     "@types/terser-webpack-plugin": "^5.2.0",
     "@types/webpack": "^5.28.1",
     "chai": "^4.3.7",
-    "grunt": "1.6.1",
+    "grunt": "^1.6.1",
     "grunt-check-dependencies": "^1.0.0",
     "grunt-cli": "^1.4.3",
     "grunt-contrib-clean": "^2.0.1",
@@ -113,8 +113,8 @@
     "serve-static": "^1.15.0"
   },
   "engines": {
-    "node": ">=12.0.0",
-    "npm": ">=6.0.0"
+    "node": ">=16.13.0",
+    "npm": ">=8.0.0"
   },
   "lint-staged": {
     "*.js": [
@@ -134,6 +134,6 @@
     "recursive": true
   },
   "versionist": {
-    "publishedAt": "2023-04-27T16:06:39.592Z"
+    "publishedAt": "2023-04-28T12:30:55.297Z"
   }
 }

package/src/config-loader/env.ts

@@ -1,12 +1,8 @@
-// TODO-MAJOR: Drop the support for the global `DEBUG` env var
-const { DEBUG: globalDebug, PINEJS_DEBUG } = process.env;
+const { PINEJS_DEBUG } = process.env;
 if (![undefined, '', '0', '1'].includes(PINEJS_DEBUG)) {
-	// TODO-MAJOR: Throw on invalid value
-	console.warn(`Invalid value for PINEJS_DEBUG '${PINEJS_DEBUG}'`);
+	throw new Error(`Invalid value for PINEJS_DEBUG '${PINEJS_DEBUG}'`);
 }
-// Setting PINEJS_DEBUG to explicitly '0' will disable debug even if global debug is truthy
-export const DEBUG =
-	PINEJS_DEBUG === '1' || (PINEJS_DEBUG !== '0' && !!globalDebug);
+export const DEBUG = PINEJS_DEBUG === '1';
 
 type CacheFnOpts<T extends (...args: any[]) => any> =
 	| {

package/src/data-server/sbvr-server.js

@@ -47,6 +47,7 @@ const serverIsOnAir = async (_req, _res, next) => {
 	}
 };
 
+/** @type {import('../config-loader/config-loader').Config} */
 export let config = {
 	models: [
 		{
@@ -59,6 +60,21 @@ export let config = {
 ALTER TABLE "textarea"
 ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;\
 `,
+				'15.0.0-data-types': async (tx, sbvrUtils) => {
+					switch (sbvrUtils.db.engine) {
+						case 'mysql':
+							await tx.executeSql(`\
+								ALTER TABLE "textarea"
+								MODIFY "is disabled" BOOLEAN NOT NULL;`);
+							break;
+						case 'postgres':
+							await tx.executeSql(`\
+								ALTER TABLE "textarea"
+								ALTER COLUMN "is disabled" SET DATA TYPE BOOLEAN USING b::BOOLEAN;`);
+							break;
+						// No need to migrate for websql
+					}
+				},
 			},
 		},
 	],
@@ -122,7 +138,7 @@ export async function setup(app, sbvrUtils, db) {
 					const instance = result[0];
 					await sbvrUtils.executeModel(tx, {
 						apiRoot: instance.is_of__vocabulary,
-						modelText: instance.model_value,
+						modelText: instance.model_value.value,
 					});
 				});
 			await isServerOnAir(true);

package/src/database-layer/db.ts

@@ -718,7 +718,7 @@ if (maybeMysql != null) {
 		const MYSQL_CHECK_CONSTRAINT_VIOLATION = 'ER_CHECK_CONSTRAINT_VIOLATED';
 		const pool = mysql.createPool(options);
 		pool.on('connection', (db) => {
-			db.query("SET sql_mode='ANSI_QUOTES';");
+			db.query("SET sql_mode='ANSI';");
 		});
 		const getConnectionAsync = () =>
 			fromCallback<Mysql.PoolConnection>((callback) => {

package/src/express-emulator/express.js

@@ -56,9 +56,8 @@ const app = (function () {
 		/** @type string */ method,
 		/** @type string */ uri,
 		/** @type {{[key: string]: any}} */ headers,
-		/** @type any */ body,
+		/** @type any */ body = '',
 	) {
-		body ??= '';
 		if (!handlers[method]) {
 			throw [404, null, null];
 		}
@@ -106,8 +105,9 @@ const app = (function () {
 						resolve([this.statusCode, data, null]);
 					}
 				},
-				sendStatus(/** @type undefined | number */ statusCode) {
-					statusCode ??= this.statusCode;
+				sendStatus(
+					/** @type undefined | number */ statusCode = this.statusCode,
+				) {
 					if (statusCode >= 400) {
 						reject([statusCode, null, null]);
 					} else {

package/src/http-transactions/transactions.js

@@ -3,6 +3,7 @@ import { odataNameToSqlName } from '@balena/odata-to-abstract-sql';
 // @ts-ignore
 const transactionModel = require('./transaction.sbvr');
 
+/** @type {import('../config-loader/config-loader').Config} */
 export let config = {
 	models: [
 		{
@@ -24,6 +25,23 @@ ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT N
 ALTER TABLE "transaction"
 ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;\
 `,
+				'15.0.0-data-types': async (tx, sbvrUtils) => {
+					switch (sbvrUtils.db.engine) {
+						case 'mysql':
+							await tx.executeSql(`\
+								ALTER TABLE "lock"
+								MODIFY "is exclusive" BOOLEAN NOT NULL,
+								MODIFY "is under lock" BOOLEAN NOT NULL;`);
+							break;
+						case 'postgres':
+							await tx.executeSql(`\
+								ALTER TABLE "lock"
+								ALTER COLUMN "is exclusive" SET DATA TYPE BOOLEAN USING b::BOOLEAN,
+								ALTER COLUMN "is under lock" SET DATA TYPE BOOLEAN USING b::BOOLEAN;`);
+							break;
+						// No need to migrate for websql
+					}
+				},
 			},
 		},
 	],

package/src/migrator/async.ts

@@ -136,17 +136,13 @@ const $run = async (
 				migration.asyncBatchSize || migratorEnv.asyncMigrationDefaultBatchSize;
 			if (migration.asyncFn && typeof migration.asyncFn === 'function') {
 				asyncRunnerMigratorFn = async (tx: Tx) => {
-					const result = await migration.asyncFn(
+					return await migration.asyncFn(
 						tx,
 						{
 							batchSize,
 						},
 						sbvrUtils,
 					);
-					if (typeof result === 'number') {
-						return result;
-					}
-					return result.rowsAffected;
 				};
 			} else if (migration.asyncSql && typeof migration.asyncSql === 'string') {
 				const asyncMigrationSqlStatement = migration.asyncSql?.replace(

package/src/migrator/utils.ts

@@ -12,6 +12,29 @@ import { delay } from '../sbvr-api/control-flow';
 
 // tslint:disable-next-line:no-var-requires
 export const modelText = require('./migrations.sbvr');
+export const migrations: Migrations = {
+	'15.0.0-data-types': async (tx, { db }) => {
+		switch (db.engine) {
+			case 'mysql':
+				await tx.executeSql(`\
+					ALTER TABLE "migration"
+					MODIFY "executed migrations" JSON NOT NULL;`);
+				await tx.executeSql(`\
+					ALTER TABLE "migration status"
+					MODIFY "is backing off" JSON NOT NULL;`);
+				break;
+			case 'postgres':
+				await tx.executeSql(`\
+					ALTER TABLE "migration"
+					ALTER COLUMN "executed migrations" SET DATA TYPE JSONB USING b::JSONB;`);
+				await tx.executeSql(`\
+					ALTER TABLE "migration status"
+					ALTER COLUMN "is backing off" SET DATA TYPE JSONB USING b::JSONB;`);
+				break;
+			// No need to migrate for websql
+		}
+	},
+};
 
 import * as sbvrUtils from '../sbvr-api/sbvr-utils';
 export enum MigrationCategories {
@@ -29,22 +52,11 @@ export type MigrationFn = (tx: Tx, sbvrUtils: SbvrUtils) => Resolvable<void>;
 export type RunnableMigrations = { [key: string]: Migration };
 export type RunnableAsyncMigrations = { [key: string]: AsyncMigration };
 export type Migrations = CategorizedMigrations | RunnableMigrations;
-export type AsyncMigrationFn =
-	| ((
-			tx: Tx,
-			options: { batchSize: number },
-			sbvrUtils: SbvrUtils,
-	  ) => Resolvable<number>)
-	| DeprecatedAsyncMigrationFn;
-
-/**
- * @deprecated
- */
-type DeprecatedAsyncMigrationFn = (
+export type AsyncMigrationFn = (
 	tx: Tx,
 	options: { batchSize: number },
 	sbvrUtils: SbvrUtils,
-) => Resolvable<Result>;
+) => Resolvable<number>;
 
 type AddFn<T extends {}, x extends 'sync' | 'async'> = T & {
 	[key in `${x}Fn`]: key extends 'syncFn' ? MigrationFn : AsyncMigrationFn;
@@ -89,14 +101,14 @@ export function isSyncMigration(
 	return typeof migration === 'function' || typeof migration === 'string';
 }
 export function areCategorizedMigrations(
-	migrations: Migrations,
-): migrations is CategorizedMigrations {
+	$migrations: Migrations,
+): $migrations is CategorizedMigrations {
 	const containsCategories = Object.keys(MigrationCategories).some(
-		(key) => key in migrations,
+		(key) => key in $migrations,
 	);
 	if (
 		containsCategories &&
-		Object.keys(migrations).some((key) => !(key in MigrationCategories))
+		Object.keys($migrations).some((key) => !(key in MigrationCategories))
 	) {
 		throw new Error(
 			'Mixing categorized and uncategorized migrations is not supported',
@@ -120,31 +132,31 @@ export type MigrationStatus = {
 };
 
 export const getRunnableAsyncMigrations = (
-	migrations: Migrations,
+	$migrations: Migrations,
 ): RunnableAsyncMigrations | undefined => {
-	if (migrations[MigrationCategories.async]) {
+	if ($migrations[MigrationCategories.async]) {
 		if (
-			Object.values(migrations[MigrationCategories.async]).some(
+			Object.values($migrations[MigrationCategories.async]).some(
 				(migration) => !isAsyncMigration(migration),
 			) ||
-			typeof migrations[MigrationCategories.async] !== 'object'
+			typeof $migrations[MigrationCategories.async] !== 'object'
 		) {
 			throw new Error(
 				`All loaded async migrations need to be of type: ${MigrationCategories.async}`,
 			);
 		}
-		return migrations[MigrationCategories.async] as RunnableAsyncMigrations;
+		return $migrations[MigrationCategories.async] as RunnableAsyncMigrations;
 	}
 };
 
 // migration loader should either get migrations from model
 // or from the filepath
 export const getRunnableSyncMigrations = (
-	migrations: Migrations,
+	$migrations: Migrations,
 ): RunnableMigrations => {
-	if (areCategorizedMigrations(migrations)) {
+	if (areCategorizedMigrations($migrations)) {
 		const runnableMigrations: RunnableMigrations = {};
-		for (const [category, categoryMigrations] of Object.entries(migrations)) {
+		for (const [category, categoryMigrations] of Object.entries($migrations)) {
 			if (category in MigrationCategories) {
 				for (const [key, migration] of Object.entries(
 					categoryMigrations as Migrations,
@@ -161,16 +173,16 @@ export const getRunnableSyncMigrations = (
 		}
 		return runnableMigrations;
 	}
-	return migrations;
+	return $migrations;
 };
 
 // turns {"key1": migration, "key3": migration, "key2": migration}
 // into  [["key1", migration], ["key2", migration], ["key3", migration]]
 export const filterAndSortPendingMigrations = (
-	migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>,
+	$migrations: NonNullable<RunnableMigrations | RunnableAsyncMigrations>,
 	executedMigrations: string[],
 ): MigrationTuple[] =>
-	(_(migrations).omit(executedMigrations) as _.Object<typeof migrations>)
+	(_($migrations).omit(executedMigrations) as _.Object<typeof $migrations>)
 		.toPairs()
 		.sortBy(([migrationKey]) => migrationKey)
 		.value();
@@ -329,8 +341,10 @@ WHERE "migration"."model name" = ${1}`,
 	if (data == null) {
 		return [];
 	}
-
-	return JSON.parse(data.executed_migrations) as string[];
+	if (typeof data.executed_migrations === 'string') {
+		return JSON.parse(data.executed_migrations);
+	}
+	return data.executed_migrations;
 };
 
 export const migrationTablesExist = async (tx: Tx) => {
@@ -354,7 +368,7 @@ WHERE NOT EXISTS (SELECT 1 FROM "migration status" WHERE "migration key" = ${5})
 			[
 				migrationStatus['migration_key'],
 				migrationStatus['start_time'],
-				migrationStatus['is_backing_off'] ? 1 : 0,
+				migrationStatus['is_backing_off'],
 				migrationStatus['run_count'],
 				migrationStatus['migration_key'],
 			],
@@ -388,7 +402,7 @@ WHERE "migration status"."migration key" = ${7};`,
 				migrationStatus['migrated_row_count'],
 				migrationStatus['error_count'],
 				migrationStatus['converged_time'],
-				migrationStatus['is_backing_off'] ? 1 : 0,
+				migrationStatus['is_backing_off'],
 				migrationStatus['migration_key'],
 			],
 		);
@@ -425,7 +439,8 @@ LIMIT 1;`,
 			migrated_row_count: data['migrated row count'],
 			error_count: data['error count'],
 			converged_time: data['converged time'],
-			is_backing_off: data['is backing off'] === 1,
+			is_backing_off:
+				data['is backing off'] === true || data['is backing off'] === 1,
 		};
 	} catch (err: any) {
 		// we report any error here, as no error should happen at all

package/src/pinejs-session-store/pinejs-session-store.ts

@@ -172,6 +172,21 @@ export class PinejsSessionStore extends Store {
 						ALTER TABLE "session"
 						ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
 					`,
+					'15.0.0-data-types': async (tx, sbvrUtils) => {
+						switch (sbvrUtils.db.engine) {
+							case 'mysql':
+								await tx.executeSql(`\
+									ALTER TABLE "session"
+									MODIFY "data" JSON NOT NULL;`);
+								break;
+							case 'postgres':
+								await tx.executeSql(`\
+									ALTER TABLE "session"
+									ALTER COLUMN "data" SET DATA TYPE JSONB USING b::JSONB;`);
+								break;
+							// No need to migrate for websql
+						}
+					},
 				},
 			},
 		],

package/src/sbvr-api/hooks.ts

@@ -51,8 +51,6 @@ export interface Hooks {
 			result: any;
 			/** This can be mutated to modify the response sent to the client */
 			response: Response;
-			/** @deprecated Use the response object instead */
-			data?: any;
 		},
 	) => HookResponse;
 	/** These are run in reverse translation order from newest to oldest */

package/src/sbvr-api/odata-response.ts

@@ -90,8 +90,7 @@ const getLocalFields = (table: AbstractSqlTable) => {
 	if (table.localFields == null) {
 		table.localFields = {};
 		for (const { fieldName, dataType } of table.fields) {
-			// TODO-MAJOR: This should also include ConceptType fields
-			if (dataType !== 'ForeignKey') {
+			if (!['ForeignKey', 'ConceptType'].includes(dataType)) {
 				const odataName = sqlNameToODataName(fieldName);
 				table.localFields[odataName] = true;
 			}

package/src/sbvr-api/permissions.ts

@@ -862,9 +862,7 @@ const rewriteRelationship = memoizeWeak(
 								foundCanAccessLink = true;
 							}
 							// return a true expression to not select the relationship, which might be virtual
-							// this should be a boolean expression, but needs to be a subquery in case it
-							// is wrapped in an `or` or `and`
-							return ['Equals', ['Boolean', true], ['Boolean', true]];
+							return ['Boolean', true];
 						};
 
 						try {
@@ -1449,26 +1447,13 @@ const checkApiKey = async (
 	apiKey: string,
 	tx?: Tx,
 ): Promise<PermissionReq['apiKey']> => {
-	let permissions: string[];
-	try {
-		permissions = await getApiKeyPermissions(apiKey, tx);
-	} catch (err: any) {
-		console.warn('Error with API key:', err);
-		// Ignore errors getting the api key and just use an empty permissions object.
-		permissions = [];
-	}
-	let actor;
-	if (permissions.length > 0) {
-		actor = await getApiKeyActorId(apiKey, tx);
-	}
-	const resolvedApiKey: PermissionReq['apiKey'] = {
+	const permissions = await getApiKeyPermissions(apiKey, tx);
+	const actor = await getApiKeyActorId(apiKey, tx);
+	return {
 		key: apiKey,
 		permissions,
+		actor,
 	};
-	if (actor != null) {
-		resolvedApiKey.actor = actor;
-	}
-	return resolvedApiKey;
 };
 
 export const resolveAuthHeader = async (
@@ -1477,11 +1462,6 @@ export const resolveAuthHeader = async (
 	// TODO: Consider making tx the second argument in the next major
 	tx?: Tx,
 ): Promise<PermissionReq['apiKey']> => {
-	// TODO-MAJOR: remove this check
-	if (req.apiKey != null) {
-		return;
-	}
-
 	const auth = req.header('Authorization');
 	if (!auth) {
 		return;
@@ -1527,11 +1507,6 @@ export const resolveApiKey = async (
 	// TODO: Consider making tx the second argument in the next major
 	tx?: Tx,
 ): Promise<PermissionReq['apiKey']> => {
-	// TODO-MAJOR: remove this check
-	if (req.apiKey != null) {
-		return;
-	}
-
 	const apiKey =
 		req.params[paramName] ?? req.body[paramName] ?? req.query[paramName];
 	if (apiKey == null) {
@@ -1541,9 +1516,6 @@ export const resolveApiKey = async (
 };
 
 export const customApiKeyMiddleware = (paramName = 'apikey') => {
-	if (paramName == null) {
-		paramName = 'apikey';
-	}
 	return async (
 		req: HookReq | Express.Request,
 		_res?: Express.Response,
@@ -1635,32 +1607,18 @@ const getReqPermissions = async (
 	req: PermissionReq,
 	odataBinds: ODataBinds = [] as any as ODataBinds,
 ) => {
-	const [guestPermissions] = await Promise.all([
-		(async () => {
-			if (
-				guestPermissionsInitialized === false &&
-				(req.user === root.user || req.user === rootRead.user)
-			) {
-				// In the case that guest permissions are not initialized yet and the query is being made with root permissions
-				// then we need to bypass `getGuestPermissions` as it will cause an infinite loop back to here.
-				// Therefore to break that loop we just ignore guest permissions.
-				return [];
-			}
-			return await getGuestPermissions();
-		})(),
-		(async () => {
-			// TODO: Remove this extra actor ID lookup making actor non-optional and updating open-balena-api.
-			if (
-				req.apiKey != null &&
-				req.apiKey.actor == null &&
-				req.apiKey.permissions != null &&
-				req.apiKey.permissions.length > 0
-			) {
-				const actorId = await getApiKeyActorId(req.apiKey.key);
-				req.apiKey!.actor = actorId;
-			}
-		})(),
-	]);
+	const guestPermissions = await (async () => {
+		if (
+			guestPermissionsInitialized === false &&
+			(req.user === root.user || req.user === rootRead.user)
+		) {
+			// In the case that guest permissions are not initialized yet and the query is being made with root permissions
+			// then we need to bypass `getGuestPermissions` as it will cause an infinite loop back to here.
+			// Therefore to break that loop we just ignore guest permissions.
+			return [];
+		}
+		return await getGuestPermissions();
+	})();
 
 	let actorPermissions: string[] = [];
 	const addActorPermissions = (actorId: number, perms: string[]) => {

package/src/sbvr-api/sbvr-utils.ts

@@ -58,6 +58,7 @@ import {
 	UnauthorizedError,
 } from './errors';
 import * as uriParser from './uri-parser';
+export { ODataRequest } from './uri-parser';
 import {
 	HookReq,
 	HookArgs,
@@ -74,8 +75,6 @@ export {
 	addPureHook,
 	addSideEffectHook,
 } from './hooks';
-// TODO-MAJOR: Remove
-export type HookRequest = uriParser.ODataRequest;
 
 import memoizeWeak = require('memoizee/weak');
 import * as controlFlow from './control-flow';
@@ -130,7 +129,7 @@ export interface User extends Actor {
 
 export interface ApiKey extends Actor {
 	key: string;
-	actor?: number;
+	actor: number;
 }
 
 export interface Response {
@@ -682,7 +681,10 @@ export const executeModels = async (
 					let uri = '/dev/model';
 					const body: AnyObject = {
 						is_of__vocabulary: model.vocab,
-						model_value: model[modelType],
+						model_value:
+							typeof model[modelType] === 'string'
+								? { value: model[modelType] }
+								: model[modelType],
 						model_type: modelType,
 					};
 					const id = result?.[0]?.id;
@@ -1624,7 +1626,7 @@ const runQuery = async (
 	tx: Db.Tx,
 	request: uriParser.ODataRequest,
 	queryIndex?: number,
-	returningIdField?: string,
+	addReturning: boolean = false,
 ): Promise<Db.Result> => {
 	const { vocabulary } = request;
 	let { sqlQuery } = request;
@@ -1653,7 +1655,10 @@ const runQuery = async (
 		api[vocabulary].logger.log(query, values);
 	}
 
-	// TODO-MAJOR: Omit the returning clause altogether if `affectedIds` has already been populated
+	// We only add the returning clause if it's been requested and `affectedIds` hasn't been populated yet
+	const returningIdField =
+		addReturning && request.affectedIds == null ? getIdField(request) : false;
+
 	const sqlResult = await tx.executeSql(query, values, returningIdField);
 
 	if (returningIdField) {
@@ -1704,7 +1709,6 @@ const respondGet = async (
 			request,
 			result,
 			response,
-			data: d,
 			tx,
 		});
 		return response;
@@ -1733,7 +1737,7 @@ const runPost = async (
 		tx,
 		request,
 		undefined,
-		getIdField(request),
+		true,
 	);
 	if (rowsAffected === 0) {
 		throw new PermissionError();
@@ -1797,19 +1801,17 @@ const runPut = async (
 	request: uriParser.ODataRequest,
 	tx: Db.Tx,
 ): Promise<undefined> => {
-	const idField = getIdField(request);
-
 	let rowsAffected: number;
 	// If request.sqlQuery is an array it means it's an UPSERT, ie two queries: [InsertQuery, UpdateQuery]
 	if (Array.isArray(request.sqlQuery)) {
 		// Run the update query first
-		({ rowsAffected } = await runQuery(tx, request, 1, idField));
+		({ rowsAffected } = await runQuery(tx, request, 1, true));
 		if (rowsAffected === 0) {
 			// Then run the insert query if nothing was updated
-			({ rowsAffected } = await runQuery(tx, request, 0, idField));
+			({ rowsAffected } = await runQuery(tx, request, 0, true));
 		}
 	} else {
-		({ rowsAffected } = await runQuery(tx, request, undefined, idField));
+		({ rowsAffected } = await runQuery(tx, request, undefined, true));
 	}
 	if (rowsAffected > 0) {
 		await validateModel(tx, _.last(request.translateVersions)!, request);
@@ -1843,12 +1845,7 @@ const runDelete = async (
 	request: uriParser.ODataRequest,
 	tx: Db.Tx,
 ): Promise<undefined> => {
-	const { rowsAffected } = await runQuery(
-		tx,
-		request,
-		undefined,
-		getIdField(request),
-	);
+	const { rowsAffected } = await runQuery(tx, request, undefined, true);
 	if (rowsAffected > 0) {
 		await validateModel(tx, _.last(request.translateVersions)!, request);
 	}
@@ -1870,6 +1867,31 @@ export const executeStandardModels = async (tx: Db.Tx): Promise<void> => {
 					ALTER TABLE "model"
 					ADD COLUMN IF NOT EXISTS "modified at" TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL;
 				`,
+				'15.0.0-data-types': async ($tx, sbvrUtils) => {
+					switch (sbvrUtils.db.engine) {
+						case 'mysql':
+							await $tx.executeSql(`\
+								ALTER TABLE "model"
+								MODIFY "model value" JSON NOT NULL;
+
+								UPDATE "model"
+								SET "model value" = CAST('{"value":' || CAST("model value" AS CHAR) || '}' AS JSON)
+								WHERE "model type" IN ('se', 'odataMetadata')
+								AND CAST("model value" AS CHAR) LIKE '"%';`);
+							break;
+						case 'postgres':
+							await $tx.executeSql(`\
+								ALTER TABLE "model"
+								ALTER COLUMN "model value" SET DATA TYPE JSONB USING "model value"::JSONB;
+
+								UPDATE "model"
+								SET "model value" = CAST('{"value":' || CAST("model value" AS TEXT) || '}' AS JSON)
+								WHERE "model type" IN ('se', 'odataMetadata')
+								AND CAST("model value" AS TEXT) LIKE '"%';`);
+							break;
+						// No need to migrate for websql
+					}
+				},
 			},
 		});
 		await executeModels(tx, permissions.config.models);