Bump pg => 7.X and sequelize => 4.X

pruhstal · pruhstal · commit f5ccd17c87ab · 2017-10-19T12:39:04.000-07:00
diff --git a/api/models/comment.js b/api/models/comment.js
@@ -7,36 +7,33 @@ module.exports = (Sequelize, DataTypes) => {
         allowNull: false,
       },
     },
-    {
-      classMethods: {
-        associate: models => {
-          Comment.hasMany(models.Comment, {
-            foreignKey: 'commentId',
-            as: 'replies',
-            onDelete: 'CASCADE',
-          });
+  );
 
-          Comment.belongsTo(models.Comment, {
-            foreignKey: 'commentId',
-            as: 'parent',
-            onDelete: 'CASCADE',
-          });
+  Comment.associate = models => {
+    Comment.hasMany(models.Comment, {
+      foreignKey: 'commentId',
+      as: 'replies',
+      onDelete: 'CASCADE',
+    });
 
-          Comment.belongsTo(models.Post, {
-            foreignKey: 'postId',
-            as: 'post',
-            onDelete: 'CASCADE',
-          });
+    Comment.belongsTo(models.Comment, {
+      foreignKey: 'commentId',
+      as: 'parent',
+      onDelete: 'CASCADE',
+    });
 
-          Comment.belongsTo(models.User, {
-            foreignKey: 'userId',
-            as: 'user',
-            onDelete: 'CASCADE',
-          });
-        },
-      },
-    }
-  );
+    Comment.belongsTo(models.Post, {
+      foreignKey: 'postId',
+      as: 'post',
+      onDelete: 'CASCADE',
+    });
+
+    Comment.belongsTo(models.User, {
+      foreignKey: 'userId',
+      as: 'user',
+      onDelete: 'CASCADE',
+    });
+  };
 
   return Comment;
 };
diff --git a/api/models/post.js b/api/models/post.js
@@ -10,25 +10,22 @@ module.exports = (Sequelize, DataTypes) => {
         type: DataTypes.TEXT,
         allowNull: true,
       },
-    },
-    {
-      classMethods: {
-        associate: models => {
-          Post.hasMany(models.Comment, {
-            foreignKey: 'postId',
-            as: 'comments',
-            onDelete: 'CASCADE',
-          });
-
-          Post.belongsTo(models.User, {
-            foreignKey: 'userId',
-            as: 'user',
-            onDelete: 'CASCADE',
-          });
-        },
-      },
     }
   );
 
+  Post.associate = models => {
+    Post.hasMany(models.Comment, {
+      foreignKey: 'postId',
+      as: 'comments',
+      onDelete: 'CASCADE',
+    });
+
+    Post.belongsTo(models.User, {
+      foreignKey: 'userId',
+      as: 'user',
+      onDelete: 'CASCADE',
+    });
+  };
+
   return Post;
 };
diff --git a/api/models/user.js b/api/models/user.js
@@ -25,25 +25,22 @@ module.exports = (Sequelize, DataTypes) => {
         type: DataTypes.STRING,
         allowNull: false,
       },
-    },
-    {
-      classMethods: {
-        associate: models => {
-          User.hasMany(models.Post, {
-            foreignKey: 'userId',
-            as: 'posts',
-            onDelete: 'CASCADE',
-          });
-
-          User.hasMany(models.Comment, {
-            foreignKey: 'userId',
-            as: 'comments',
-            onDelete: 'CASCADE',
-          });
-        },
-      },
     }
   );
 
+  User.associate = models => {
+    User.hasMany(models.Post, {
+      foreignKey: 'userId',
+      as: 'posts',
+      onDelete: 'CASCADE',
+    });
+
+    User.hasMany(models.Comment, {
+      foreignKey: 'userId',
+      as: 'comments',
+      onDelete: 'CASCADE',
+    });
+  };
+
   return User;
 };
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
     "next-routes": "^1.0.40",
     "passport": "^0.3.2",
     "passport-local": "^1.0.0",
-    "pg": "^6.4.2",
+    "pg": "^7.3.0",
     "pg-hstore": "^2.3.2",
     "postcss-cssnext": "^2.11.0",
     "prop-types": "^15.5.10",
@@ -40,7 +40,7 @@
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
     "redux-thunk": "^2.2.0",
-    "sequelize": "^3.30.4",
+    "sequelize": "^4.15.0",
     "styled-jsx-postcss": "^0.2.0"
   }
 }
