yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-14 01:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed custom primaryType option

Browse Source
This commit is contained in:
KuongKnight 2018-08-02 23:13:38 +07:00
parent 6c0abfc314
commit f508da6fce
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-hook-bookshelf/lib/index.js
View File

@ -524,7 +524,7 @@ module.exports = function(strapi) {
if (definition.primaryKeyType === 'uuid' && definition.client === 'pg') { if (definition.primaryKeyType === 'uuid' && definition.client === 'pg') {
idAttributeBuilder = ['id uuid NOT NULL DEFAULT uuid_generate_v4() NOT NULL PRIMARY KEY']; idAttributeBuilder = ['id uuid NOT NULL DEFAULT uuid_generate_v4() NOT NULL PRIMARY KEY'];
} else if (definition.primaryKeyType !== 'integer') { } else if (definition.primaryKeyType !== 'integer') {
idAttributeBuilder = [`id ${definition.primaryKeyType} NOT NULL PRIMARY KEY`]; idAttributeBuilder = [`id ${getType({type: definition.primaryKeyType})} NOT NULL PRIMARY KEY`];
} }
const columns = generateColumns(attributes, idAttributeBuilder).join(',\n\r'); const columns = generateColumns(attributes, idAttributeBuilder).join(',\n\r');
@ -598,8 +598,6 @@ module.exports = function(strapi) {
const changeRequired = definition.client === 'pg' const changeRequired = definition.client === 'pg'
? `ALTER COLUMN ${quote}${attribute}${quote} ${attributes[attribute].required ? 'SET' : 'DROP'} NOT NULL` ? `ALTER COLUMN ${quote}${attribute}${quote} ${attributes[attribute].required ? 'SET' : 'DROP'} NOT NULL`
: `CHANGE ${quote}${attribute}${quote} ${quote}${attribute}${quote} ${type} ${attributes[attribute].required ? 'NOT' : ''} NULL`; : `CHANGE ${quote}${attribute}${quote} ${quote}${attribute}${quote} ${type} ${attributes[attribute].required ? 'NOT' : ''} NULL`;
//console.log(`ALTER TABLE ${quote}${table}${quote} ${changeType}`);
//console.log(`ALTER TABLE ${quote}${table}${quote} ${changeRequired}`);
await ORM.knex.raw(`ALTER TABLE ${quote}${table}${quote} ${changeType}`); await ORM.knex.raw(`ALTER TABLE ${quote}${table}${quote} ${changeType}`);
await ORM.knex.raw(`ALTER TABLE ${quote}${table}${quote} ${changeRequired}`); await ORM.knex.raw(`ALTER TABLE ${quote}${table}${quote} ${changeRequired}`);
} }