From f40c1f517a2d018c5a0802251182c3025a4a5ead Mon Sep 17 00:00:00 2001 From: WalkingPizza Date: Wed, 31 Aug 2022 10:56:06 +0200 Subject: [PATCH 1/2] Allow USE RETURNING in SQLite --- packages/core/database/lib/dialects/sqlite/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/core/database/lib/dialects/sqlite/index.js b/packages/core/database/lib/dialects/sqlite/index.js index c3f10d21a3..1b91a6c214 100644 --- a/packages/core/database/lib/dialects/sqlite/index.js +++ b/packages/core/database/lib/dialects/sqlite/index.js @@ -24,6 +24,10 @@ class SqliteDialect extends Dialect { fse.ensureDirSync(dbDir); } + useReturning() { + return true; + } + async initialize() { await this.db.connection.raw('pragma foreign_keys = on'); } From b36327cae7e9f0259ba183af424c71865f860ad4 Mon Sep 17 00:00:00 2001 From: Gustav Hansen Date: Tue, 6 Sep 2022 14:48:54 +0200 Subject: [PATCH 2/2] SelectMany/ SelectOne: Fix loadingMessage prop-types --- .../admin/src/content-manager/components/SelectMany/index.js | 2 +- .../admin/src/content-manager/components/SelectOne/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js b/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js index a599f6161f..0b7088a9ce 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectMany/index.js @@ -121,7 +121,7 @@ SelectMany.propTypes = { displayNavigationLink: PropTypes.bool.isRequired, isDisabled: PropTypes.bool.isRequired, isLoading: PropTypes.bool.isRequired, - loadingMessage: PropTypes.string.isRequired, + loadingMessage: PropTypes.func.isRequired, mainField: PropTypes.shape({ name: PropTypes.string.isRequired, schema: PropTypes.shape({ diff --git a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js index b5986e4697..ebc17ba87d 100644 --- a/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js +++ b/packages/core/admin/admin/src/content-manager/components/SelectOne/index.js @@ -72,7 +72,7 @@ SelectOne.propTypes = { components: PropTypes.object, isDisabled: PropTypes.bool.isRequired, isLoading: PropTypes.bool.isRequired, - loadingMessage: PropTypes.string.isRequired, + loadingMessage: PropTypes.func.isRequired, mainField: PropTypes.shape({ name: PropTypes.string.isRequired, schema: PropTypes.shape({