From a6b8602378c0490e8c1bfef4a589717220bb9111 Mon Sep 17 00:00:00 2001
From: Ivan Shmidt <bahoc47@gmail.com>
Date: Fri, 24 Jul 2020 04:01:21 +0200
Subject: [PATCH] fix: tsc and pr comments

---
 packages/backend/src/index.ts                         | 11 ++++++-----
 .../default-app/packages/backend/src/index.ts.hbs     |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/index.ts b/packages/backend/src/index.ts
index 8b9edec327..0da700d205 100644
--- a/packages/backend/src/index.ts
+++ b/packages/backend/src/index.ts
@@ -29,7 +29,7 @@ import {
 } from '@backstage/backend-common';
 import { ConfigReader, AppConfig } from '@backstage/config';
 import { loadConfig } from '@backstage/config-loader';
-import knex from 'knex';
+import knex, { PgConnectionConfig } from 'knex';
 import auth from './plugins/auth';
 import catalog from './plugins/catalog';
 import identity from './plugins/identity';
@@ -59,11 +59,12 @@ function makeCreateEnv(loadedConfigs: AppConfig[]) {
         client: 'pg',
         useNullAsDefault: true,
         connection: {
-          host: process.env.PG_HOST,
-          user: process.env.PG_USER,
-          password: process.env.PG_PASSWORD,
+          port: process.env.POSTGRES_PORT,
+          host: process.env.POSTGRES_HOST,
+          user: process.env.POSTGRES_USER,
+          password: process.env.POSTGRES_PASSWORD,
           database: `backstage_plugin_${plugin}`,
-        },
+        } as PgConnectionConfig,
       };
     } else {
       knexConfig = {
diff --git a/packages/cli/templates/default-app/packages/backend/src/index.ts.hbs b/packages/cli/templates/default-app/packages/backend/src/index.ts.hbs
index 5e98afb6d1..591fa1a28f 100644
--- a/packages/cli/templates/default-app/packages/backend/src/index.ts.hbs
+++ b/packages/cli/templates/default-app/packages/backend/src/index.ts.hbs
@@ -29,7 +29,12 @@ import {
 } from '@backstage/backend-common';
 import { ConfigReader, AppConfig } from '@backstage/config';
 import { loadConfig } from '@backstage/config-loader';
+{{#if dbTypePG}}
 import knex, { PgConnectionConfig } from 'knex';
+{{/if}}
+{{#if dbTypeSqlite}}
+import knex from 'knex';
+{{/if}}
 import auth from './plugins/auth';
 import catalog from './plugins/catalog';
 import identity from './plugins/identity';