yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 18:27:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'features/api-token-v2' into api-token-v2/sync-token-type-and-permissions

Browse Source
This commit is contained in:
Simone Taeggi 2022-09-07 10:43:28 +02:00
commit 38ecaa30dc
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/admin/src/content-manager/components/SelectMany/index.js
View File

@ -121,7 +121,7 @@ SelectMany.propTypes = {
displayNavigationLink: PropTypes.bool.isRequired, displayNavigationLink: PropTypes.bool.isRequired,
isDisabled: PropTypes.bool.isRequired, isDisabled: PropTypes.bool.isRequired,
isLoading: PropTypes.bool.isRequired, isLoading: PropTypes.bool.isRequired,
loadingMessage: PropTypes.string.isRequired, loadingMessage: PropTypes.func.isRequired,
mainField: PropTypes.shape({ mainField: PropTypes.shape({
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
schema: PropTypes.shape({ schema: PropTypes.shape({

2
packages/core/admin/admin/src/content-manager/components/SelectOne/index.js
View File

@ -72,7 +72,7 @@ SelectOne.propTypes = {
components: PropTypes.object, components: PropTypes.object,
isDisabled: PropTypes.bool.isRequired, isDisabled: PropTypes.bool.isRequired,
isLoading: PropTypes.bool.isRequired, isLoading: PropTypes.bool.isRequired,
loadingMessage: PropTypes.string.isRequired, loadingMessage: PropTypes.func.isRequired,
mainField: PropTypes.shape({ mainField: PropTypes.shape({
name: PropTypes.string.isRequired, name: PropTypes.string.isRequired,
schema: PropTypes.shape({ schema: PropTypes.shape({

4
packages/core/database/lib/dialects/sqlite/index.js
View File

@ -24,6 +24,10 @@ class SqliteDialect extends Dialect {
fse.ensureDirSync(dbDir); fse.ensureDirSync(dbDir);
} }
useReturning() {
return true;
}
async initialize() { async initialize() {
await this.db.connection.raw('pragma foreign_keys = on'); await this.db.connection.raw('pragma foreign_keys = on');
} }