gtfs 3.8.0 → 4.0.0

package/test/mocha/import-gtfs.js

@@ -9,7 +9,7 @@ import should from 'should';
 
 import { unzip } from '../../lib/file-utils.js';
 import config from '../test-config.js';
-import { openDb, getDb, closeDb, importGtfs, getRoutes } from '../../index.js';
+import { openDb, closeDb, importGtfs, getRoutes } from '../../index.js';
 import models from '../../models/models.js';
 
 let db;
@@ -30,13 +30,13 @@ const agenciesFixturesLocal = [
 ];
 
 describe('importGtfs():', function () {
-  before(async () => {
-    db = await openDb(config);
+  before(() => {
+    db = openDb(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
   });
 
   this.timeout(10000);
@@ -47,7 +47,7 @@ describe('importGtfs():', function () {
         agencies: agenciesFixturesRemote,
       });
 
-      const routes = await getRoutes();
+      const routes = getRoutes();
       should.exist(routes);
       routes.length.should.equal(4);
     });
@@ -58,7 +58,7 @@ describe('importGtfs():', function () {
         agencies: agenciesFixturesLocal,
       });
 
-      const routes = await getRoutes();
+      const routes = getRoutes();
       should.exist(routes);
       routes.length.should.equal(4);
     });
@@ -127,9 +127,9 @@ describe('importGtfs():', function () {
 
     for (const model of models) {
       it(`should import the same number of ${model.filenameBase}`, async () => {
-        const result = await db.get(
-          `SELECT COUNT(*) FROM ${model.filenameBase};`
-        );
+        const result = await db
+          .prepare(`SELECT COUNT(*) FROM ${model.filenameBase};`)
+          .get();
         result['COUNT(*)'].should.equal(countData[model.filenameBase]);
       });
     }

package/test/mocha/{get-db.js → open-db.js}

@@ -4,7 +4,7 @@ import should from 'should';
 import fs from 'fs';
 
 import config from '../test-config.js';
-import { openDb, getDb, closeDb, importGtfs, getShapes } from '../../index.js';
+import { openDb, closeDb, importGtfs, getShapes } from '../../index.js';
 
 const db2Config = {
   ...config,
@@ -17,62 +17,70 @@ const db2Config = {
   sqlitePath: './tmpdb',
 };
 
-describe('getDb():', () => {
+describe('openDb():', () => {
   before(async () => {
-    await openDb(config);
+    openDb(config);
     await importGtfs(config);
   });
 
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
 
     // Close db2 and then delete it
-    const db2 = getDb(db2Config);
-    await closeDb(db2);
+    const db2 = openDb(db2Config);
+    closeDb(db2);
     fs.unlinkSync(db2Config.sqlitePath);
   });
 
-  it('should allow raw db queries: calendar_dates', async () => {
+  it('should allow raw db queries: calendar_dates', () => {
     const serviceIds = ['CT-16APR-Caltrain-Weekday-01'];
-    const db = getDb();
-    const results = await db.all(
-      `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
-        .map((serviceId) => `'${serviceId}'`)
-        .join(', ')})`
-    );
+    const db = openDb();
+    const results = db
+      .prepare(
+        `SELECT * FROM calendar_dates WHERE exception_type = 1 AND service_id NOT IN (${serviceIds
+          .map((serviceId) => `'${serviceId}'`)
+          .join(', ')})`
+      )
+      .all();
 
     should.exists(results);
     results.should.have.length(4);
   });
 
-  it('should allow raw db queries: trips', async () => {
+  it('should allow raw db queries: trips', () => {
     // Find all trips between two stop ids
     const startStopId = '70261';
     const endStopId = '70131';
-    const db = getDb();
-    const results = await db.all(
-      'SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))',
-      [startStopId, endStopId]
-    );
+    const db = openDb();
+    const results = db
+      .prepare(
+        'SELECT * from trips where trips.trip_id IN (SELECT start_stop_times.trip_id FROM stop_times as start_stop_times WHERE stop_id = ? AND start_stop_times.stop_sequence < (SELECT end_stop_times.stop_sequence FROM stop_times as end_stop_times WHERE end_stop_times.stop_sequence > start_stop_times.stop_sequence AND end_stop_times.trip_id = start_stop_times.trip_id AND end_stop_times.stop_id = ? ))'
+      )
+      .all(startStopId, endStopId);
     should.exists(results);
     results.should.have.length(62);
   });
 
   it('should allow multiple db connections', async () => {
-    const db2 = await openDb(db2Config);
+    const db2 = openDb(db2Config);
     await importGtfs(db2Config);
 
-    const db1 = getDb(config);
+    const db1 = openDb(config);
 
-    db1.config.filename.should.equal(':memory:');
-    db2.config.filename.should.equal('./tmpdb');
+    db1.name.should.equal(':memory:');
+    db2.name.should.equal('./tmpdb');
 
     // Query db1 for shapes
     const shapeId = 'cal_sf_tam';
-    const results1 = await getShapes({
-      shape_id: shapeId,
-    });
+    const results1 = getShapes(
+      {
+        shape_id: shapeId,
+      },
+      [],
+      [],
+      { db: db1 }
+    );
 
     const expectedResult = {
       id: 1424,
@@ -88,7 +96,7 @@ describe('getDb():', () => {
     results1.should.containEql(expectedResult);
 
     // Query db2 for shapes, none should exist
-    const results2 = await getShapes(
+    const results2 = getShapes(
       {
         shape_id: shapeId,
       },

package/test/mocha/raw-query.js

@@ -0,0 +1,34 @@
+/* eslint-env mocha */
+
+import should from 'should';
+
+import config from '../test-config.js';
+import { openDb, closeDb, importGtfs } from '../../index.js';
+
+describe('Raw Query:', () => {
+  before(async () => {
+    openDb(config);
+    await importGtfs(config);
+  });
+
+  after(() => {
+    const db = openDb(config);
+    closeDb(db);
+  });
+
+  it('should DELETE a trip', () => {
+    const db = openDb(config);
+
+    const results = db.prepare('SELECT count(*) FROM trips').get();
+
+    should.exists(results);
+    results['count(*)'].should.equal(218);
+
+    db.exec("DELETE FROM trips where trip_id = '329';");
+
+    const newResults = db.prepare('SELECT count(*) FROM trips').get();
+
+    should.exists(newResults);
+    newResults['count(*)'].should.equal(217);
+  });
+});

package/test/mocha/exec-raw-query.js

@@ -1,39 +0,0 @@
-/* eslint-env mocha */
-
-import should from 'should';
-
-import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  execRawQuery,
-  runRawQuery,
-} from '../../index.js';
-
-describe('execRawQuery():', () => {
-  before(async () => {
-    await openDb(config);
-    await importGtfs(config);
-  });
-
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
-  });
-
-  it('should DELETE a trip', async () => {
-    const results = await runRawQuery('SELECT count(*) FROM trips');
-
-    should.exists(results);
-    results[0]['count(*)'].should.equal(218);
-
-    await execRawQuery('DELETE FROM trips where trip_id = "329"');
-
-    const newResults = await runRawQuery('SELECT count(*) FROM trips');
-
-    should.exists(newResults);
-    newResults[0]['count(*)'].should.equal(217);
-  });
-});

package/test/mocha/run-raw-query.js

@@ -1,54 +0,0 @@
-/* eslint-env mocha */
-
-import should from 'should';
-
-import config from '../test-config.js';
-import {
-  openDb,
-  getDb,
-  closeDb,
-  importGtfs,
-  runRawQuery,
-} from '../../index.js';
-
-describe('runRawQuery():', () => {
-  before(async () => {
-    await openDb(config);
-    await importGtfs(config);
-  });
-
-  after(async () => {
-    const db = getDb(config);
-    await closeDb(db);
-  });
-
-  it('should return empty array if no trips', async () => {
-    const results = await runRawQuery(
-      'SELECT * FROM trips WHERE trip_id = "fake-trip-id"'
-    );
-
-    should.exists(results);
-    results.should.have.length(0);
-  });
-
-  it('should return expected results', async () => {
-    const results = await runRawQuery(
-      'SELECT "trip_id", "arrival_time" FROM stop_times WHERE trip_id = "329"'
-    );
-
-    const expectedResults = [
-      { trip_id: '329', arrival_time: '9:09:00' },
-      { trip_id: '329', arrival_time: '8:52:00' },
-      { trip_id: '329', arrival_time: '8:44:00' },
-      { trip_id: '329', arrival_time: '8:35:00' },
-      { trip_id: '329', arrival_time: '8:27:00' },
-      { trip_id: '329', arrival_time: '8:16:00' },
-      { trip_id: '329', arrival_time: '8:03:00' },
-      { trip_id: '329', arrival_time: '7:56:00' },
-    ];
-
-    should.exist(results);
-    results.length.should.equal(8);
-    expectedResults.should.match(results);
-  });
-});