Cleanup duty

src/db/connector.ts

-export interface DatabaseConnector {
+export interface IDatabaseConnector {
     Open(): void;
     Get(sql: string, parameters?: any): Promise<any>;
     All(sql: string, parameters?: any): Promise<any[]>;

src/db/postgres.ts

-import {IMain, IDatabase} from 'pg-promise';
+import {IMain, IDatabase} from "pg-promise";
+import * as pgPromise from "pg-promise";
 import { Log } from "../log";
-import { DatabaseConnector } from "./connector";
+import { IDatabaseConnector } from "./connector";
 const log = new Log("SQLite3");
 
-const pgPromise = require("pg-promise");
-
 const pgp: IMain = pgPromise({
     // Initialization Options
 });
 
-export class Postgres implements DatabaseConnector {
+export class Postgres implements IDatabaseConnector {
+    public static ParameterizeSql(sql: string): string {
+        return sql.replace(/\$((\w|\d|_)+)+/g, (k) => {
+            return "${" + k.substr("$".length) + "}";
+        });
+    }
+
     private db: IDatabase<any>;
     constructor (private connectionString: string) {
 
     }
-
     public Open() {
         // Hide username:password
         const logConnString = this.connectionString.substr(
-            this.connectionString.indexOf("@") || 0
+            this.connectionString.indexOf("@") || 0,
         );
         log.info(`Opening ${logConnString}`);
         this.db = pgp(this.connectionString);
@@ -47,10 +51,4 @@ export class Postgres implements DatabaseConnector {
         log.silly("Exec:", sql);
         return this.db.none(sql);
     }
-
-    public static ParameterizeSql(sql: string): string {
-        return sql.replace(/\$((\w|\d|_)+)+/g, (k) => {
-            return "${" + k.substr("$".length) + "}";
-        });
-    }
 }

src/db/sqlite3.ts

 import * as Database from "better-sqlite3";
 import { Log } from "../log";
-import { DatabaseConnector } from "./connector";
+import { IDatabaseConnector } from "./connector";
 const log = new Log("SQLite3");
 
-export class SQLite3 implements DatabaseConnector {
+export class SQLite3 implements IDatabaseConnector {
     private db: Database;
     constructor (private filename: string) {
 

src/store.ts

@@ -7,7 +7,7 @@ export const CURRENT_SCHEMA = 7;
 import { Log } from "./log";
 import { DiscordBridgeConfigDatabase } from "./config";
 import { Postgres } from "./db/postgres";
-import { DatabaseConnector } from "./db/connector";
+import { IDatabaseConnector } from "./db/connector";
 const log = new Log("DiscordStore");
 /**
  * Stores data for specific users and data not specific to rooms.
@@ -16,7 +16,7 @@ export class DiscordStore {
   /**
    * @param  {string} filepath Location of the SQLite database file.
    */
-  public db: DatabaseConnector;
+  public db: IDatabaseConnector;
   private version: number;
   private config: DiscordBridgeConfigDatabase;
   constructor (private configOrFile: DiscordBridgeConfigDatabase|string) {
@@ -296,7 +296,7 @@ export class DiscordStore {
         this.db = new Postgres(this.config.connString);
     }
     try {
-        await this.db.Open();
+        this.db.Open();
     } catch (ex) {
       log.error("Error opening database:", ex);
       throw new Error("Couldn't open database. The appservice won't be able to continue.");

test/test_channelsyncroniser.ts

 import * as Chai from "chai";
 import * as ChaiAsPromised from "chai-as-promised";
-import * as log from "npmlog";
 import * as Discord from "discord.js";
 import * as Proxyquire from "proxyquire";