From 9eba44dee8bd54fd2fa648140b2b0ef08edab2eb Mon Sep 17 00:00:00 2001 From: "Kalle (Sendou)" <38327916+Sendouc@users.noreply.github.com> Date: Thu, 10 Sep 2020 18:59:11 +0300 Subject: [PATCH] knexfile changes --- index.js | 6 ++---- knexfile.ts | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index d86327c25..e44f3140b 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,3 @@ -require("dotenv").config() const { ApolloServer } = require("apollo-server-express") const mongoose = require("mongoose") const express = require("express") @@ -10,6 +9,7 @@ const cors = require("cors") const passport = require("passport") const { Model, knexSnakeCaseMappers } = require("objection") const Knex = require("knex") +import knexConfiguration from "./knexfile" const DiscordStrategy = require("passport-discord").Strategy const User = require("./mongoose-models/user") const path = require("path") @@ -17,9 +17,7 @@ const schema = require("./schema") const mockUser = require("./utils/mocks") const knex = Knex({ - client: "pg", - connection: "postgresql://localhost:5432/postgres", - + ...knexConfiguration, ...knexSnakeCaseMappers(), }) diff --git a/knexfile.ts b/knexfile.ts index 48f056203..607ed97c6 100644 --- a/knexfile.ts +++ b/knexfile.ts @@ -1,4 +1,7 @@ +require("dotenv").config() + module.exports = { client: "pg", - connection: "postgresql://localhost:5432/postgres", + connection: process.env.POSTGRESQL_URI, + ssl: true, }