Refactoring models to use a single column for primaryKey

LearnNavi · Jul 29, 2017 · 3864f4d · 3864f4d
1 parent 6994e4b
commit 3864f4d
Show file tree

Hide file tree

Showing 28 changed files with 117 additions and 198 deletions.
diff --git a/eanaEltuMigration/dictionary.js b/eanaEltuMigration/dictionary.js
diff --git a/models/dictionaryBlock.js b/models/dictionaryBlock.js
@@ -9,8 +9,7 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         DictionaryBlock.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/dictionaryBuild.js b/models/dictionaryBuild.js
@@ -1,7 +1,7 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const DictionaryBuild = sequelize.define('DictionaryBuild', {
-        id: { type: DataTypes.STRING, primaryKey: true },
+        name: { type: DataTypes.STRING, allowNull: false },
         description: { type: DataTypes.STRING }
     });
 

diff --git a/models/dictionaryBuildData.js b/models/dictionaryBuildData.js
@@ -1,7 +1,7 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const DictionaryBuildData = sequelize.define('DictionaryBuildData', {
-        position: { type: DataTypes.INTEGER, primaryKey: true },
+        position: { type: DataTypes.INTEGER, allowNull: false },
         type: { type: DataTypes.STRING},
         data: { type: DataTypes.TEXT, allowNull: true }
     });
@@ -10,7 +10,6 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         DictionaryBuildData.belongsTo(models.DictionaryBuild, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
@@ -19,7 +18,6 @@ module.exports = function (sequelize, DataTypes) {
 
         DictionaryBuildData.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/dictionaryTemplate.js b/models/dictionaryTemplate.js
@@ -11,8 +11,7 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         DictionaryTemplate.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/entryLayout.js b/models/entryLayout.js
@@ -21,8 +21,7 @@ module.exports = function (sequelize, DataTypes) {
             through: {
                 model: models.EntryLayoutTemplates,
                 unique: false
-            },
-            primaryKey: true
+            }
         });
     };
 

diff --git a/models/entryLayoutTemplates.js b/models/entryLayoutTemplates.js
@@ -1,8 +1,9 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const EntryLayoutTemplates = sequelize.define('EntryLayoutTemplates', {
-        position: { type: DataTypes.INTEGER, primaryKey: true, defaultValue: 0 },
-        field: { type: DataTypes.STRING, primaryKey: true }
+        id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
+        position: { type: DataTypes.INTEGER, allowNull: false, defaultValue: 0 },
+        field: { type: DataTypes.STRING, allowNull: false }
     });
 
     EntryLayoutTemplates.associate = function (models) {
@@ -13,7 +14,6 @@ module.exports = function (sequelize, DataTypes) {
 
         EntryLayoutTemplates.belongsTo(models.EntryLayout, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/entryTemplate.js b/models/entryTemplate.js
@@ -12,8 +12,7 @@ module.exports = function (sequelize, DataTypes) {
             through: {
                 model: models.EntryLayoutTemplates,
                 unique: false
-            },
-            primaryKey: true
+            }
         });
     };
 

diff --git a/models/entryType.js b/models/entryType.js
@@ -18,12 +18,8 @@ module.exports = function (sequelize, DataTypes) {
             onDelete: 'CASCADE'
         });
 
-        EntryType.belongsToMany(models.Lemma, {
-            through: {
-                model: models.EntryTypeEntries,
-                unique: false
-            },
-            primaryKey: true
+        EntryType.hasMany(models.Lemma, {
+            onDelete: 'CASCADE'
         });
 
         EntryType.belongsToMany(models.Metadata, {

diff --git a/models/entryTypeEntries.js b/models/entryTypeEntries.js
diff --git a/models/entryTypeLayouts.js b/models/entryTypeLayouts.js
@@ -1,16 +1,13 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const EntryTypeLayout = sequelize.define('EntryTypeLayout', {
-        order: { type: DataTypes.INTEGER, primaryKey: true }
+        order: { type: DataTypes.INTEGER, allowNull: false }
     });
 
-    EntryTypeLayout.removeAttribute('id');
-
     EntryTypeLayout.associate = function (models) {
         // associations can be defined here
         EntryTypeLayout.belongsTo(models.EntryType, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
@@ -19,7 +16,6 @@ module.exports = function (sequelize, DataTypes) {
 
         EntryTypeLayout.belongsTo(models.EntryLayout, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/entryTypeTemplates.js b/models/entryTypeTemplates.js
diff --git a/models/grapheme.js b/models/grapheme.js
@@ -1,16 +1,15 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const Grapheme = sequelize.define('Grapheme', {
-        id: { type: DataTypes.STRING, primaryKey: true },
+        grapheme: { type: DataTypes.STRING, allowNull: false },
         sortOrder: { type: DataTypes.INTEGER, allowNull: false }
     });
 
     Grapheme.associate = function (models) {
         // associations can be defined here
         Grapheme.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/graphemePhonemeCorrespondence.js b/models/graphemePhonemeCorrespondence.js
@@ -10,7 +10,6 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         GraphemePhonemeCorrespondence.belongsTo(models.Grapheme, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
@@ -19,7 +18,6 @@ module.exports = function (sequelize, DataTypes) {
 
         GraphemePhonemeCorrespondence.belongsTo(models.Phoneme, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/lemma.js b/models/lemma.js
@@ -16,8 +16,7 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         Lemma.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/lemmaClassType.js b/models/lemmaClassType.js
@@ -1,7 +1,7 @@
 'use strict';
 module.exports = function (sequelize, DataTypes) {
     const LemmaClassType = sequelize.define('LemmaClassType', {
-        id: { type: DataTypes.STRING, allowNull: false, primaryKey: true },
+        classType: { type: DataTypes.STRING, allowNull: false },
         name: { type: DataTypes.STRING, allowNull: false },
         abbreviation: { type: DataTypes.STRING, allowNull: false },
         description: { type: DataTypes.STRING, allowNull: true }
@@ -11,7 +11,6 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         LemmaClassType.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/lemmaClassTypeAssociation.js b/models/lemmaClassTypeAssociation.js
@@ -10,7 +10,6 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         LemmaClassTypeAssociation.belongsTo(models.Lemma, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
@@ -19,7 +18,6 @@ module.exports = function (sequelize, DataTypes) {
 
         LemmaClassTypeAssociation.belongsTo(models.LemmaClassType, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/lemmaDefinition.js b/models/lemmaDefinition.js
@@ -10,21 +10,17 @@ module.exports = function (sequelize, DataTypes) {
         odd: DataTypes.TEXT
     });
 
-    LemmaDefinition.removeAttribute('id');
-
     LemmaDefinition.associate = function (models) {
         // associations can be defined here
         LemmaDefinition.belongsTo(models.Lemma, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'
         });
         LemmaDefinition.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/linkedLemma.js b/models/linkedLemma.js
@@ -5,13 +5,10 @@ module.exports = function (sequelize, DataTypes) {
         note: { type: DataTypes.STRING, allowNull: true }
     });
 
-    LinkedLemma.removeAttribute('id');
-
     LinkedLemma.associate = function (models) {
         // associations can be defined here
         LinkedLemma.belongsTo(models.Lemma, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
@@ -20,7 +17,6 @@ module.exports = function (sequelize, DataTypes) {
         LinkedLemma.belongsTo(models.Lemma, {
             as: "ReferencesLemma",
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/localizedEntryLayout.js b/models/localizedEntryLayout.js
@@ -6,21 +6,17 @@ module.exports = function (sequelize, DataTypes) {
         changeable: { type: DataTypes.STRING, allowNull: false, defaultValue: "" }
     });
 
-    LocalizedEntryLayout.removeAttribute('id');
-
     LocalizedEntryLayout.associate = function (models) {
         // associations can be defined here
         LocalizedEntryLayout.belongsTo(models.EntryType, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
             onDelete: 'CASCADE'
         });
         LocalizedEntryLayout.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/localizedMetadata.js b/models/localizedMetadata.js
@@ -5,21 +5,17 @@ module.exports = function (sequelize, DataTypes) {
         value: { type: DataTypes.TEXT, allowNull: false }
     });
 
-    LocalizedMetadata.removeAttribute('id');
-
     LocalizedMetadata.associate = function (models) {
         // associations can be defined here
         LocalizedMetadata.belongsTo(models.Metadata, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'
         });
         LocalizedMetadata.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,

diff --git a/models/morpheme.js b/models/morpheme.js
@@ -15,8 +15,7 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         Morpheme.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/morphemeAffixType.js b/models/morphemeAffixType.js
@@ -9,8 +9,7 @@ module.exports = function (sequelize, DataTypes) {
         // associations can be defined here
         MorphemeAffixType.belongsTo(models.Language, {
             foreignKey: {
-                allowNull: false,
-                primaryKey: true
+                allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'

diff --git a/models/morphemeDefinition.js b/models/morphemeDefinition.js
@@ -10,21 +10,17 @@ module.exports = function (sequelize, DataTypes) {
         odd: DataTypes.TEXT
     });
 
-    MorphemeDefinition.removeAttribute('id');
-
     MorphemeDefinition.associate = function (models) {
         // associations can be defined here
         MorphemeDefinition.belongsTo(models.Morpheme, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,
             onDelete: 'cascade'
         });
         MorphemeDefinition.belongsTo(models.Language, {
             foreignKey: {
-                primaryKey: true,
                 allowNull: false
             },
             constraints: true,