From 512a31ba95a01c7e903ed70644a7bbf49d1e9327 Mon Sep 17 00:00:00 2001 From: "Timothy J. Warren" Date: Wed, 28 Jan 2015 16:10:10 -0500 Subject: [PATCH] Remove troublesome/unstable sqlite3 adapter. Dblite supports sqlite3, and actually installs reliably --- README.md | 1 - docs/index.html | 1 - lib/adapters/sqlite3.js | 29 ----------- package.json | 3 -- tests/adapters/sqlite3_test.js | 94 ---------------------------------- 5 files changed, 128 deletions(-) delete mode 100644 lib/adapters/sqlite3.js delete mode 100644 tests/adapters/sqlite3_test.js diff --git a/README.md b/README.md index adc098e..2adfd76 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ A node query builder for various SQL databases, based on CodeIgniter's query bui * mysql2 * pg * dblite -* sqlite3 * node-firebird ### Installation diff --git a/docs/index.html b/docs/index.html index aa32934..859dcd6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -103,7 +103,6 @@
  • mysql2
  • pg
  • dblite
  • -
  • sqlite3
  • node-firebird
  • Installation

    npm install ci-node-query

    Basic use

    var nodeQuery = require('ci-node-query');
    diff --git a/lib/adapters/sqlite3.js b/lib/adapters/sqlite3.js
    deleted file mode 100644
    index f39e687..0000000
    --- a/lib/adapters/sqlite3.js
    +++ /dev/null
    @@ -1,29 +0,0 @@
    -'use strict';
    -
    -var adapter = require('../adapter'),
    -	getArgs = require('getargs');
    -
    -/** @module adapters/dblite */
    -var Sqlite3 = function(instance) {
    -
    -	// That 'new' keyword is annoying
    -	if ( ! (this instanceof Sqlite3)) return new Sqlite3(instance);
    -
    -	/**
    -	 * Run the sql query as a prepared statement
    -	 *
    -	 * @param {String} sql - The sql with placeholders
    -	 * @param {Array} params - The values to insert into the query
    -	 * @param {Function} callback - Callback to run when a response is recieved
    -	 * @return void
    -	 */
    -	adapter.execute = function(/*sql, params, callback*/) {
    -		var args = getArgs('sql:string, [params]:array, callback:function', arguments);
    -
    -		instance.all(args.sql, args.params, args.callback);
    -	};
    -
    -	return adapter;
    -}
    -
    -module.exports = Sqlite3;
    \ No newline at end of file
    diff --git a/package.json b/package.json
    index 1414687..b22c862 100644
    --- a/package.json
    +++ b/package.json
    @@ -25,7 +25,6 @@
         "postgres",
         "sqlite",
         "dblite",
    -    "sqlite3",
         "firebird",
         "node-firebird"
       ],
    @@ -46,7 +45,6 @@
       "optionalDependencies": {
         "dblite": "^0.6.1",
         "node-firebird": "^0.2.4",
    -    "sqlite3": "^3.0.2",
         "pg": "^3.6.2"
       },
       "devDependencies": {
    @@ -67,7 +65,6 @@
         "mysql2",
         "node-firebird",
         "pg",
    -    "sqlite3"
       ],
       "license": "MIT",
       "scripts": {
    diff --git a/tests/adapters/sqlite3_test.js b/tests/adapters/sqlite3_test.js
    deleted file mode 100644
    index 8ed4fce..0000000
    --- a/tests/adapters/sqlite3_test.js
    +++ /dev/null
    @@ -1,94 +0,0 @@
    -'use strict';
    -
    -// Load the test base
    -delete require.cache[require.resolve('../query-builder-base')];
    -var testBase = require('../query-builder-base');
    -var tests = testBase.tests;
    -
    -// Load the test config file
    -var adapterName = 'sqlite3';
    -var sqlite = null;
    -var connection = null;
    -
    -// Set up the connection
    -try {
    -	sqlite = require(adapterName).verbose();
    -	connection = new sqlite.Database(':memory:');
    -} catch (e) {
    -	// Export an empty testsuite if module not loaded
    -	console.log(e);
    -	console.log("Database adapter sqlite3 not found");
    -	return {};
    -}
    -
    -if (connection)
    -{
    -	// Set up the query builder object
    -	var nodeQuery = require('../../lib/node-query');
    -	var qb = nodeQuery.init('sqlite', connection, adapterName);
    -
    -	// Set up the sqlite database
    -	var sql = 'CREATE TABLE IF NOT EXISTS "create_test" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);';
    -	var sql2 = 'CREATE TABLE IF NOT EXISTS "create_join" ("id" INTEGER PRIMARY KEY, "key" TEXT, "val" TEXT);';
    -	connection.serialize(function() {
    -		connection.run(sql);
    -		connection.run(sql2);
    -	});
    -
    -	// Set up the test base
    -	testBase._setUp(qb, function(test, err, result) {
    -		if (err != null) {
    -			test.done();
    -			throw new Error(err);
    -		}
    -
    -		// Insert/Update/Delete queries return undefined
    -		if (result === undefined) {
    -			result = {};
    -		}
    -
    -		test.ok(result, 'sqlite3: Valid result for generated query');
    -		test.done();
    -	});
    -
    -	tests['Select tests']['Select with function and argument in WHERE clause'] = function(test) {
    -		test.expect(1);
    -		qb.select('id')
    -			.from('create_test')
    -			.where('id', 'ABS(-88)')
    -			.get(function(err, rows) {
    -				if (err != null) {
    -					test.done();
    -					throw new Error(err);
    -				}
    -
    -				test.ok(rows, 'sqlite3: Valid result for generated query');
    -				test.done();
    -			});
    -	};
    -
    -	tests['nodeQuery.getQuery = nodeQuery.init'] = function(test) {
    -		test.expect(1);
    -		test.deepEqual(qb, nodeQuery.getQuery(), "getQuery returns same object");
    -		test.done();
    -	};
    -
    -	tests["sqlite3 adapter with query builder"] = function(test) {
    -		test.expect(1);
    -		test.ok(testBase.qb);
    -
    -		// Close the db connection
    -		connection.close();
    -		test.done();
    -	};
    -
    -	// Export the final test object
    -	module.exports = tests;
    -}
    -else
    -{
    -	module.exports = {};
    -}
    -
    -
    -