Fix new DB initialization, AGAIN.

Switch to @decafcode/sqlite for database access
schema: Fix M0011 for newly-created databases
2020-01-05 10:45:40 -05:00 · 2020-01-05 10:00:12 -05:00 · 2019-12-09 23:06:20 -05:00 · 2019-12-09 22:55:25 -05:00 · 2019-11-30 14:13:49 -05:00 · 2019-11-30 14:05:36 -05:00
12 changed files with 193 additions and 131 deletions
@@ -192,6 +192,14 @@
        }
      }
    },
+    "@decafcode/sqlite": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@decafcode/sqlite/-/sqlite-2.0.0.tgz",
+      "integrity": "sha512-CvDlc1G2ExETrRXVjjHRZmZiDCY56pw3xU3pxWnOzkQ4j4bi+DUAYlQbFKwpb4BzRdFo84e7H+T2kmoEBf90JA==",
+      "requires": {
+        "node-gyp-build": "^4.2.0"
+      }
+    },
    "@jest/console": {
      "version": "24.9.0",
      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
@@ -401,15 +409,6 @@
        "@babel/types": "^7.3.0"
      }
    },
-    "@types/better-sqlite3": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-5.4.0.tgz",
-      "integrity": "sha512-nzm7lJ7l3jBmGUbtkL8cdOMhPkN6Pw2IM+b0V7iIKba+YKiLrjkIy7vVLsBIVnd7+lgzBzrHsXZxCaFTcmw5Ow==",
-      "dev": true,
-      "requires": {
-        "@types/integer": "*"
-      }
-    },
    "@types/body-parser": {
      "version": "1.17.1",
      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz",
@@ -474,12 +473,6 @@
        "@types/range-parser": "*"
      }
    },
-    "@types/integer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/integer/-/integer-1.0.0.tgz",
-      "integrity": "sha512-3viiRKLoSP2Qr78nMoQjkDc0fan4BgmpOyV1+1gKjE8wWXo3QQ78WItO6f9WuBf3qe3ymDYhM65oqHTOZ0rFxw==",
-      "dev": true
-    },
    "@types/istanbul-lib-coverage": {
      "version": "2.0.1",
      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
@@ -889,15 +882,6 @@
        "tweetnacl": "^0.14.3"
      }
    },
-    "better-sqlite3": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-5.4.3.tgz",
-      "integrity": "sha512-fPp+8f363qQIhuhLyjI4bu657J/FfMtgiiHKfaTsj3RWDkHlWC1yT7c6kHZDnBxzQVoAINuzg553qKmZ4F1rEw==",
-      "requires": {
-        "integer": "^2.1.0",
-        "tar": "^4.4.10"
-      }
-    },
    "body-parser": {
      "version": "1.19.0",
      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
@@ -1104,11 +1088,6 @@
        }
      }
    },
-    "chownr": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="
-    },
    "ci-info": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
@@ -1983,14 +1962,6 @@
      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
    },
-    "fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "requires": {
-        "minipass": "^2.6.0"
-      }
-    },
    "fs.realpath": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2614,9 +2585,9 @@
      "dev": true
    },
    "handlebars": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
-      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
+      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
      "dev": true,
      "requires": {
        "neo-async": "^2.6.0",
@@ -2770,11 +2741,6 @@
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
    },
-    "integer": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/integer/-/integer-2.1.0.tgz",
-      "integrity": "sha512-vBtiSgrEiNocWvvZX1RVfeOKa2mCHLZQ2p9nkQkQZ/BvEiY+6CcUz0eyjvIiewjJoeNidzg2I+tpPJvpyspL1w=="
-    },
    "invariant": {
      "version": "2.2.4",
      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -3818,24 +3784,8 @@
    "minimist": {
      "version": "0.0.8",
      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-    },
-    "minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      }
-    },
-    "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "requires": {
-        "minipass": "^2.9.0"
-      }
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
    },
    "mixin-deep": {
      "version": "1.3.2",
@@ -3862,6 +3812,7 @@
      "version": "0.5.1",
      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
      "requires": {
        "minimist": "0.0.8"
      }
@@ -3968,6 +3919,11 @@
        "lower-case": "^1.1.1"
      }
    },
+    "node-gyp-build": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.0.tgz",
+      "integrity": "sha512-4oiumOLhCDU9Rronz8PZ5S4IvT39H5+JEv/hps9V8s7RSLhsac0TCP78ulnHXOo8X1wdpPiTayGlM1jr4IbnaQ=="
+    },
    "node-int64": {
      "version": "0.4.0",
      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -4634,7 +4590,8 @@
    "safe-buffer": {
      "version": "5.2.0",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
+      "dev": true
    },
    "safe-regex": {
      "version": "1.1.0",
@@ -5191,20 +5148,6 @@
      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
      "dev": true
    },
-    "tar": {
-      "version": "4.4.13",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz",
-      "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==",
-      "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      }
-    },
    "test-exclude": {
      "version": "5.2.3",
      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
@@ -5376,9 +5319,9 @@
      "dev": true
    },
    "uglify-js": {
-      "version": "3.6.8",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz",
-      "integrity": "sha512-XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz",
+      "integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==",
      "dev": true,
      "optional": true,
      "requires": {
@@ -5650,11 +5593,6 @@
      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
      "dev": true
    },
-    "yallist": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
-    },
    "yargs": {
      "version": "13.3.0",
      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
@@ -5,7 +5,7 @@
  "main": "src/index.js",
  "private": true,
  "dependencies": {
-    "better-sqlite3": "^5.4.3",
+    "@decafcode/sqlite": "^2.0.0",
    "compression": "^1.7.3",
    "date-fns": "^1.30.1",
    "debug": "^4.1.1",
@@ -20,7 +20,6 @@
    "supports-color": "^7.1.0"
  },
  "devDependencies": {
-    "@types/better-sqlite3": "^5.4.0",
    "@types/compression": "^0.0.36",
    "@types/debug": "^4.1.5",
    "@types/dotenv": "^6.1.1",
@@ -82,6 +82,29 @@ create table "cm_user_activity" (
    )
 );

+create table "cm_user_course" (
+    "id" integer primary key not null,
+    "profile_id" integer not null
+            references "cm_user_data"("id")
+            on delete cascade,
+    "course_id" integer not null,
+    "class_id" integer not null,
+    "play_count" integer not null,
+    "score_max" integer not null,
+    "is_full_combo" text not null,
+    "is_all_justice" text not null,
+    "is_success" text not null,
+    "score_rank" integer not null,
+    "event_id" integer not null,
+    "last_play_date" text not null,
+    "param1" integer not null,
+    "param2" integer not null,
+    "param3" integer not null,
+    "param4" integer not null,
+    "is_clear" text not null,
+    constraint "cm_user_course_uq" unique ("profile_id", "course_id")
+);
+
 create table "cm_user_data_ex" (
    "id" integer primary key not null
            references "cm_user_data"("id")
@@ -122,6 +145,23 @@ create table "cm_user_data_ex" (
    "ext_long5" integer not null
 );

+create table "cm_user_duel_list" (
+    "id" integer primary key not null,
+    "profile_id" integer not null
+            references "cm_user_data"("id")
+            on delete cascade,
+    "duel_id" integer not null,
+    "progress" integer not null,
+    "point" integer not null,
+    "is_clear" boolean not null,
+    "last_play_date" text not null,
+    "param1" integer not null,
+    "param2" integer not null,
+    "param3" integer not null,
+    "param4" integer not null,
+    constraint "cm_user_duel_list_uq" unique ("profile_id", "duel_id")
+);
+
 create table "cm_user_character" (
    "id" integer primary key not null,
    "profile_id" integer not null
@@ -0,0 +1,23 @@
+-- This was not present in new DBs initialized to schema version 11.
+create table if not exists "cm_user_course" (
+    "id" integer primary key not null,
+    "profile_id" integer not null
+            references "cm_user_data"("id")
+            on delete cascade,
+    "course_id" integer not null,
+    "class_id" integer not null,
+    "play_count" integer not null,
+    "score_max" integer not null,
+    "is_full_combo" text not null,
+    "is_all_justice" text not null,
+    "is_success" text not null,
+    "score_rank" integer not null,
+    "event_id" integer not null,
+    "last_play_date" text not null,
+    "param1" integer not null,
+    "param2" integer not null,
+    "param3" integer not null,
+    "param4" integer not null,
+    "is_clear" text not null,
+    constraint "cm_user_course_uq" unique ("profile_id", "course_id")
+);
@@ -0,0 +1,17 @@
+-- This was also not present in the db init scripts...
+create table if not exists "cm_user_duel_list" (
+    "id" integer primary key not null,
+    "profile_id" integer not null
+            references "cm_user_data"("id")
+            on delete cascade,
+    "duel_id" integer not null,
+    "progress" integer not null,
+    "point" integer not null,
+    "is_clear" boolean not null,
+    "last_play_date" text not null,
+    "param1" integer not null,
+    "param2" integer not null,
+    "param3" integer not null,
+    "param4" integer not null,
+    constraint "cm_user_duel_list_uq" unique ("profile_id", "duel_id")
+);
@@ -50,13 +50,13 @@ export function loadTopTen(res: LoadTopTenResponse): Buffer {
      buf.writeUInt8(row.field_0F ? 1 : 0, innerOff + 0x000f); // Boolean
      buf.writeUInt8(row.field_10, innerOff + 0x0010);
      iconv.encode(row.driverName, "shift_jis").copy(buf, innerOff + 0x0014);
-      iconv.encode(row.teamName, "shift_jis").copy(buf, innerOff + 0x0028);
+      iconv.encode(row.team.name, "shift_jis").copy(buf, innerOff + 0x0028);
      iconv.encode(row.shopName, "shift_jis").copy(buf, innerOff + 0x0048);
-      buf.writeUInt32LE(row.field_74, innerOff + 0x0074);
-      buf.writeUInt16LE(row.field_78, innerOff + 0x0078);
+      buf.writeUInt32LE(row.team.nameBg, innerOff + 0x0074);
+      buf.writeUInt16LE(row.team.nameFx, innerOff + 0x0078);
      buf.writeUInt8(row.field_7C, innerOff + 0x007c);
      buf.writeUInt8(row.field_7D, innerOff + 0x007d);
-      // 66 bytes of fucking nothing what
+      // 66 bytes of empty space at the end. Maybe a string used to live here?
    }
  }

@@ -18,7 +18,7 @@ export async function loadTopTen(
    }

    const { routeNo, minTimestamp } = selector;
-    const src = await w.timeAttack().loadTopTen(routeNo, minTimestamp);
+    const src = await w.timeAttack().loadTop(routeNo, minTimestamp, 10);

    if (src.length === 0) {
      continue;
@@ -33,10 +33,8 @@ export async function loadTopTen(
        field_0F: false,
        field_10: 0,
        driverName: srcItem.driverName,
-        teamName: process.env.TEAM_NAME || "",
        shopName: process.env.SHOP_NAME || "",
-        field_74: 0,
-        field_78: 0,
+        team: srcItem.team,
        field_7C: 0,
        field_7D: 0,
        ta: srcItem.ta,
@@ -111,13 +111,15 @@ export interface TeamReservationRepository {
 // TODO extend and factorize
 export interface TopTenResult {
  driverName: string;
+  team: Model.Team;
  ta: Model.TimeAttackScore;
 }

 export interface TimeAttackRepository {
-  loadTopTen(
+  loadTop(
    routeNo: Model.RouteNo,
-    minTimestamp: Date
+    minTimestamp: Date,
+    limit: number
  ): Promise<TopTenResult[]>;

  loadAll(profileId: Id<Model.Profile>): Promise<Model.TimeAttackScore[]>;
@@ -7,10 +7,12 @@ export interface LoadTopTenResponseRow {
  field_0F: boolean;
  field_10: number;
  driverName: string;
-  teamName: string;
  shopName: string;
-  field_74: number;
-  field_78: number;
+  team: {
+    name: string;
+    nameBg: number;
+    nameFx: number;
+  };
  field_7C: number;
  field_7D: number;
  ta: TimeAttackScore;
@@ -1,7 +1,8 @@
 import sql from "sql-bricks-postgres";

-import { RouteNo } from "../model/base";
+import { ExtId, RouteNo } from "../model/base";
 import { CarSelector } from "../model/car";
+import { Team } from "../model/team";
 import { Profile } from "../model/profile";
 import { TimeAttackScore } from "../model/timeAttack";
 import { TimeAttackRepository, TopTenResult } from "../repo";
@@ -23,23 +24,51 @@ function _extractRow(row: Row): TimeAttackScore {
 export class SqlTimeAttackRepository implements TimeAttackRepository {
  constructor(private readonly _txn: Transaction) {}

-  async loadTopTen(
+  async loadTop(
    routeNo: RouteNo,
-    minTimestamp: Date
+    minTimestamp: Date,
+    limit: number
  ): Promise<TopTenResult[]> {
+    // We're not using an ORM here so this join-heavy SQL is unfortunately
+    // going to be a boilerplated mess.
+
    const loadSql = sql
-      .select("p.name", "ta.*")
+      .select(
+        // Profile
+        "p.name as profile_name",
+        // Team
+        "t.ext_id as team_ext_id",
+        "t.name as team_name",
+        "t.name_bg as team_name_bg",
+        "t.name_fx as team_name_fx",
+        "t.register_time as team_register_time",
+        // Time Attack
+        "ta.*"
+      )
      .from("idz_ta_best ta")
      .join("idz_profile p", { "ta.profile_id": "p.id" })
+      // This is an inner join, so it will exclude anybody who is not currently
+      // a member of a team from the leader boards. Since the only way to play
+      // without a team is to be ejected from one we can consider this an edge
+      // case that we probably don't need to worry about.
+      .join("idz_team_member tm", { "ta.profile_id": "tm.id" })
+      .join("idz_team t", { "tm.team_id": "t.id" })
      .where("ta.route_no", routeNo)
      .where(sql.gt("ta.timestamp", minTimestamp))
      .orderBy(["ta.total_time asc", "ta.timestamp asc"])
-      .limit(10);
+      .limit(limit);

    const rows = await this._txn.fetchRows(loadSql);

    return rows.map(row => ({
-      driverName: row.name,
+      driverName: row.profile_name,
+      team: {
+        extId: parseInt(row.team_ext_id) as ExtId<Team>,
+        name: row.team_name,
+        nameBg: parseInt(row.team_name_bg),
+        nameFx: parseInt(row.team_name_fx),
+        registerTime: new Date(row.team_register_time),
+      },
      ta: _extractRow(row),
    }));
  }
@@ -1,14 +1,10 @@
-import Database from "better-sqlite3";
+import Database, { ResultRow } from "@decafcode/sqlite";
 import { randomBytes } from "crypto";
 import * as sql from "sql-bricks-postgres";

 import { DataSource, Row, Transaction } from "./api";
 import { Id } from "../model";

-type MixedRow = {
-  [key: string]: any;
-};
-
 // bless me father for i have sinned
 const fuFixup = new RegExp(" FOR UPDATE$");

@@ -41,7 +37,7 @@ function _preprocess(stmt: sql.Statement) {
  };
 }

-function _postprocess(obj: MixedRow): Row {
+function _postprocess(obj: ResultRow): Row {
  const result = {};

  for (const [k, v] of Object.entries(obj)) {
@@ -58,7 +54,7 @@ function _postprocess(obj: MixedRow): Row {
 }

 class SqliteTransaction implements Transaction {
-  constructor(private readonly _db: Database.Database) {}
+  constructor(private readonly _db: Database) {}

  generateId<T>(): Id<T> {
    const buf = randomBytes(8);
@@ -73,26 +69,43 @@ class SqliteTransaction implements Transaction {

  modify(stmt: sql.Statement): Promise<void> {
    const params = _preprocess(stmt);
+    const prepared = this._db.prepare(params.text);

-    this._db.prepare(params.text).run(...params.values);
+    try {
+      prepared.run(params.values);
+    } finally {
+      prepared.close();
+    }

    return Promise.resolve();
  }

  fetchRow(stmt: sql.SelectStatement): Promise<Row | undefined> {
    const params = _preprocess(stmt);
-    const raw = this._db.prepare(params.text).get(...params.values);
-    const result = raw && _postprocess(raw);
+    const prepared = this._db.prepare(params.text);

-    return Promise.resolve(result);
+    try {
+      const raw = prepared.one(params.values);
+      const result = raw && _postprocess(raw);
+
+      return Promise.resolve(result);
+    } finally {
+      prepared.close();
+    }
  }

  fetchRows(stmt: sql.SelectStatement): Promise<Row[]> {
    const params = _preprocess(stmt);
-    const raw = this._db.prepare(params.text).all(...params.values);
-    const result = raw.map(_postprocess);
+    const prepared = this._db.prepare(params.text);

-    return Promise.resolve(result);
+    try {
+      const raw = prepared.all(params.values);
+      const result = raw.map(_postprocess);
+
+      return Promise.resolve(result);
+    } finally {
+      prepared.close();
+    }
  }

  raw(sql: string): Promise<void> {
@@ -110,28 +123,32 @@ class SqliteDataSource implements DataSource {
  ): Promise<T> {
    const db = new Database(this._path);

-    db.defaultSafeIntegers();
-    db.prepare("pragma foreign_keys = on").run();
-    db.prepare("begin").run();
-
    try {
+      db.exec("begin");
+
      const txn = new SqliteTransaction(db);
      const result = await callback(txn);

-      db.prepare("commit").run();
+      db.exec("commit");

      return result;
    } catch (e) {
-      db.prepare("rollback").run();
+      db.exec("rollback");

      return Promise.reject(e);
+    } finally {
+      db.close();
    }
  }

  vacuum(): Promise<void> {
    const db = new Database(this._path);

-    db.prepare("vacuum").run();
+    try {
+      db.exec("vacuum");
+    } finally {
+      db.close();
+    }

    return Promise.resolve();
  }
@@ -22,9 +22,6 @@ if not exist node_modules (
    echo The server's dependencies will now be installed.
    echo This process requires an internet connection and may take some time.
    echo.
-    echo NOTE: If install fails try running the following command as admin:
-    echo npm install -g windows-build-tools
-    echo.

    pause
    call npm install
Author	SHA1	Message	Date
Tau	5311618d1d	Fix new DB initialization, AGAIN.	2020-01-05 10:45:40 -05:00
Tau	37ce14dda7	Switch to @decafcode/sqlite for database access	2020-01-05 10:00:12 -05:00
Tau	0d8d5845c9	schema: Fix M0011 for newly-created databases	2019-12-09 23:06:20 -05:00
Tau	143f534ba1	npm audit	2019-12-09 22:55:25 -05:00
Tau	4db3d94ee8	idz: Un-hardcode result limit in repo layer Minor design nit but I should probably take my own code review advice.	2019-11-30 14:13:49 -05:00
Tau	e195cf77cd	idz: Wire up TA topTen team results	2019-11-30 14:05:36 -05:00
Tau	ac9622f1bd	idz: Extend Time Attack topTen result set	2019-11-30 14:05:14 -05:00
Tau	e8535b1a80	idz: Label additional team info in topTen response	2019-11-30 13:35:37 -05:00