From 1158fe5ef5c65e4750ed668e6ab0369e9033f30d Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Thu, 9 Jun 2022 16:43:52 -0600 Subject: [PATCH 1/8] Addressed current security vulnerabilities by updating all packages to latest and fixed/updated tests throughout the project. --- package.json | 6 +- test/binary-clause-tests.js | 2 +- test/clause-definition.js | 2 +- test/dialects/aggregate-tests.js | 38 +++++------ test/dialects/alias-tests.js | 10 +-- test/dialects/alter-table-tests.js | 26 ++++---- test/dialects/array-tests.js | 18 +++--- test/dialects/binary-clause-tests.js | 8 +-- test/dialects/case-tests.js | 16 ++--- test/dialects/cast-tests.js | 24 +++---- test/dialects/clause-ordering-tests.js | 8 +-- test/dialects/create-table-tests.js | 46 ++++++------- test/dialects/create-view-tests.js | 6 +- test/dialects/date-tests.js | 24 +++---- test/dialects/delete-tests.js | 14 ++-- test/dialects/distinct-on-tests.js | 4 +- test/dialects/distinct-tests.js | 10 +-- test/dialects/drop-table-tests.js | 8 +-- test/dialects/for-share-tests.js | 4 +- test/dialects/for-update-tests.js | 4 +- test/dialects/from-clause-tests.js | 8 +-- test/dialects/function-tests.js | 6 +- test/dialects/group-by-tests.js | 10 +-- test/dialects/having-tests.js | 6 +- test/dialects/hstore-tests.js | 4 +- test/dialects/ilike-tests.js | 8 +-- test/dialects/in-clause-tests.js | 14 ++-- test/dialects/indexes-tests.js | 22 +++---- test/dialects/insert-tests.js | 86 ++++++++++++------------- test/dialects/join-tests.js | 18 +++--- test/dialects/join-to-tests.js | 6 +- test/dialects/json-tests.js | 8 +-- test/dialects/limit-and-offset-tests.js | 8 +-- test/dialects/literal-tests.js | 6 +- test/dialects/matches-test.js | 6 +- test/dialects/namespace-tests.js | 10 +-- test/dialects/not-in-clause-tests.js | 14 ++-- test/dialects/order-tests.js | 28 ++++---- test/dialects/regex-tests.js | 8 +-- test/dialects/replace-tests.js | 86 ++++++++++++------------- test/dialects/returning-tests.js | 4 +- test/dialects/schema-tests.js | 12 ++-- test/dialects/select-tests.js | 36 +++++------ test/dialects/shortcut-tests.js | 12 ++-- test/dialects/subfield-tests.js | 8 +-- test/dialects/subquery-tests.js | 20 +++--- test/dialects/support.js | 4 +- test/dialects/table-tests.js | 54 ++++++++-------- test/dialects/ternary-clause-tests.js | 4 +- test/dialects/tostring-tests.js | 14 ++-- test/dialects/truncate-table-tests.js | 2 +- test/dialects/unary-clause-tests.js | 4 +- test/dialects/update-tests.js | 18 +++--- test/dialects/value-expression-tests.js | 12 ++-- test/dialects/where-clause-tests.js | 16 ++--- test/function-tests.js | 20 +++--- test/index-tests.js | 42 ++++++------ test/select-tests.js | 4 +- test/table-tests.js | 48 +++++++------- test/ternary-clause-tests.js | 2 +- test/unary-clause-tests.js | 2 +- test/value-expression-tests.js | 4 +- 62 files changed, 491 insertions(+), 491 deletions(-) diff --git a/package.json b/package.json index dc250c01..b25af235 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "main": "lib/", "types": "lib/types.d.ts", "scripts": { - "test": "node_modules/.bin/mocha", + "test": "mocha", "lint": "jshint lib test", "posttest": "jshint lib test" }, @@ -20,8 +20,8 @@ "node": "*" }, "dependencies": { - "sliced": "0.0.x", - "lodash": "4.1.x" + "sliced": "1.0.x", + "lodash": "4.17.x" }, "devDependencies": { "jshint": "*", diff --git a/test/binary-clause-tests.js b/test/binary-clause-tests.js index 10c50737..9d4f6157 100644 --- a/test/binary-clause-tests.js +++ b/test/binary-clause-tests.js @@ -8,7 +8,7 @@ var Foo = Table.define({ columns: ['baz','bar'] }); -test('operators', function() { +it ('operators', function() { assert.equal(Foo.baz.equals(1).operator, '='); assert.equal(Foo.baz.equal(1).operator, '='); assert.equal(Foo.baz.notEqual(1).operator, '<>'); diff --git a/test/clause-definition.js b/test/clause-definition.js index ebbf936d..993233af 100644 --- a/test/clause-definition.js +++ b/test/clause-definition.js @@ -15,7 +15,7 @@ var Boom = Node.define({ } }); -test('clause definition', function() { +it('clause definition', function() { var select = new Bang(); assert.equal(select.type, 'SELECT'); assert.equal(select.nodes.length, 0); diff --git a/test/dialects/aggregate-tests.js b/test/dialects/aggregate-tests.js index 59d48d57..069b1995 100644 --- a/test/dialects/aggregate-tests.js +++ b/test/dialects/aggregate-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var customerAlias = Harness.defineCustomerAliasTable(); -Harness.test({ +Harness.it({ query: post.select(post.count()), pg: { text : 'SELECT COUNT("post".*) AS "post_count" FROM "post"', @@ -30,7 +30,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.count('post_count')), pg: { text : 'SELECT COUNT("post".*) AS "post_count" FROM "post"', @@ -55,7 +55,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.count().as('post_amount')), pg: { text : 'SELECT COUNT("post".*) AS "post_amount" FROM "post"', @@ -80,7 +80,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.count()), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -105,7 +105,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.count('content_count')), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -130,7 +130,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.count().as('content_count')), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -155,7 +155,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.count()), pg: { text : 'SELECT COUNT("customer".*) AS "customer_count" FROM "customer"', @@ -176,7 +176,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.min()), pg: { text : 'SELECT MIN("post"."id") AS "id_min" FROM "post"', @@ -201,7 +201,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.min().as('min_id')), pg: { text : 'SELECT MIN("post"."id") AS "min_id" FROM "post"', @@ -226,7 +226,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.min('min_id')), pg: { text : 'SELECT MIN("post"."id") AS "min_id" FROM "post"', @@ -251,7 +251,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.max()), pg: { text : 'SELECT MAX("post"."id") AS "id_max" FROM "post"', @@ -276,7 +276,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.max().as('max_id')), pg: { text : 'SELECT MAX("post"."id") AS "max_id" FROM "post"', @@ -301,7 +301,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.max('max_id')), pg: { text : 'SELECT MAX("post"."id") AS "max_id" FROM "post"', @@ -326,7 +326,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.sum()), pg: { text : 'SELECT SUM("post"."id") AS "id_sum" FROM "post"', @@ -351,7 +351,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.sum().as('sum_id')), pg: { text : 'SELECT SUM("post"."id") AS "sum_id" FROM "post"', @@ -376,7 +376,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.sum('sum_id')), pg: { text : 'SELECT SUM("post"."id") AS "sum_id" FROM "post"', @@ -401,7 +401,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.avg()), pg: { text : 'SELECT AVG("post"."id") AS "id_avg" FROM "post"', @@ -426,7 +426,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.avg().as('avg_id')), pg: { text : 'SELECT AVG("post"."id") AS "avg_id" FROM "post"', @@ -451,7 +451,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.avg('avg_id')), pg: { text : 'SELECT AVG("post"."id") AS "avg_id" FROM "post"', diff --git a/test/dialects/alias-tests.js b/test/dialects/alias-tests.js index 32db9308..4a9c99c8 100644 --- a/test/dialects/alias-tests.js +++ b/test/dialects/alias-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: customer.select(customer.name.isNull().as('nameIsNull')), pg: { text : 'SELECT ("customer"."name" IS NULL) AS "nameIsNull" FROM "customer"', @@ -29,7 +29,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(customer.name.plus(customer.age).as('nameAndAge')).where(customer.age.gt(10).and(customer.age.lt(20))), pg: { text : 'SELECT ("customer"."name" + "customer"."age") AS "nameAndAge" FROM "customer" WHERE (("customer"."age" > $1) AND ("customer"."age" < $2))', @@ -54,7 +54,7 @@ Harness.test({ params: [10, 20] }); -Harness.test({ +Harness.it({ query: customer.select(customer.age.between(10, 20).as('ageBetween')), pg: { text : 'SELECT ("customer"."age" BETWEEN $1 AND $2) AS "ageBetween" FROM "customer"', @@ -79,7 +79,7 @@ Harness.test({ params: [10, 20] }); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.ROUND(customer.age.as('ageBetween'), 2)), pg: { text : 'SELECT ROUND("customer"."age", $1) FROM "customer"', @@ -104,7 +104,7 @@ Harness.test({ params: [2] }); -Harness.test({ +Harness.it({ query: customer.select(customer.age.notBetween(10, 20).as('ageNotBetween')), pg: { text : 'SELECT ("customer"."age" NOT BETWEEN $1 AND $2) AS "ageNotBetween" FROM "customer"', diff --git a/test/dialects/alter-table-tests.js b/test/dialects/alter-table-tests.js index d050da3d..6f143c45 100644 --- a/test/dialects/alter-table-tests.js +++ b/test/dialects/alter-table-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var Table = require(__dirname + '/../../lib/table'); -Harness.test({ +Harness.it({ query: post.alter().dropColumn(post.content), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content"', @@ -29,7 +29,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.alter().dropColumn(post.content).dropColumn(post.userId), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content", DROP COLUMN "userId"', @@ -54,7 +54,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.alter().dropColumn('content').dropColumn('userId'), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content", DROP COLUMN "userId"', @@ -79,7 +79,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.alter().rename('posts'), pg: { text : 'ALTER TABLE "post" RENAME TO "posts"', @@ -112,7 +112,7 @@ var group = Table.define({ ] }); -Harness.test({ +Harness.it({ query: group.alter().addColumn(group.id), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100)', @@ -137,7 +137,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.alter().addColumn(group.id).addColumn(group.userId), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100), ADD COLUMN "userId" varchar(100)', @@ -162,7 +162,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.alter().addColumn('id', 'varchar(100)').addColumn('userId', 'varchar(100)'), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100), ADD COLUMN "userId" varchar(100)', @@ -187,7 +187,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.alter().renameColumn('userId', 'newUserId'), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "newUserId"', @@ -208,7 +208,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.alter().renameColumn(group.userId, 'newUserId'), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "newUserId"', @@ -229,7 +229,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.alter().renameColumn('userId', group.id), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "id"', @@ -259,7 +259,7 @@ var UserWithSignature = Table.define({ ] }); -Harness.test({ +Harness.it({ query: UserWithSignature.alter().renameColumn(UserWithSignature.get('Signature'), 'sig'), pg: { text : 'ALTER TABLE "UserWithSignature" RENAME COLUMN "Signature" TO "sig"', @@ -295,7 +295,7 @@ var post = Table.define({ }] }); -Harness.test({ +Harness.it({ query: post.alter().addColumn(post.userId), pg: { text : 'ALTER TABLE "post" ADD COLUMN "userId" int REFERENCES "user"("id")', @@ -316,7 +316,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.alter().addColumn(post.picture), pg: { text : 'ALTER TABLE "post" ADD COLUMN "picture" varchar(100)', diff --git a/test/dialects/array-tests.js b/test/dialects/array-tests.js index f4191400..6c3a3ed6 100644 --- a/test/dialects/array-tests.js +++ b/test/dialects/array-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var Sql = require('../../lib'); // Array columns -Harness.test({ +Harness.it({ query: post.update({ tags: post.tags.concat(Sql.array('nodejs')) }), @@ -16,7 +16,7 @@ Harness.test({ params: ['nodejs'] }); -Harness.test({ +Harness.it({ query: post.select( post.tags.contains(Sql.array('nodejs', 'js')) ), @@ -27,7 +27,7 @@ Harness.test({ params: ['nodejs', 'js'] }); -Harness.test({ +Harness.it({ query: post.select( post.tags.containedBy(Sql.array('nodejs', 'js')) ), @@ -38,7 +38,7 @@ Harness.test({ params: ['nodejs', 'js'] }); -Harness.test({ +Harness.it({ query: post.select( post.tags.overlap(Sql.array('nodejs', 'js')) ), @@ -49,7 +49,7 @@ Harness.test({ params: ['nodejs', 'js'] }); -Harness.test({ +Harness.it({ query: post.select(post.tags.slice(2,3)), pg: { text : 'SELECT ("post"."tags")[$1:$2] FROM "post"', @@ -58,7 +58,7 @@ Harness.test({ params: [2, 3] }); -Harness.test({ +Harness.it({ query: post.select(post.tags.at(2)), pg: { text : 'SELECT ("post"."tags")[$1] FROM "post"', @@ -68,7 +68,7 @@ Harness.test({ }); // Array literals -Harness.test({ +Harness.it({ query: post.select(Sql.array(1,2,3)), pg: { text : 'SELECT ARRAY[$1, $2, $3] FROM "post"', @@ -77,7 +77,7 @@ Harness.test({ params: [1, 2, 3] }); -Harness.test({ +Harness.it({ query: post.select(Sql.array(1,2,3).slice(2,3)), pg: { text : 'SELECT (ARRAY[$1, $2, $3])[$4:$5] FROM "post"', @@ -86,7 +86,7 @@ Harness.test({ params: [1,2,3,2,3] }); -Harness.test({ +Harness.it({ query: post.select(Sql.array(1,2,3).at(2)), pg: { text : 'SELECT (ARRAY[$1, $2, $3])[$4] FROM "post"', diff --git a/test/dialects/binary-clause-tests.js b/test/dialects/binary-clause-tests.js index 69c355fe..e619d6b0 100644 --- a/test/dialects/binary-clause-tests.js +++ b/test/dialects/binary-clause-tests.js @@ -6,7 +6,7 @@ var customerAlias = Harness.defineCustomerAliasTable(); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: customer.select(customer.name.plus(customer.age)), pg: { text : 'SELECT ("customer"."name" + "customer"."age") FROM "customer"', @@ -31,7 +31,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.name_alias.plus(customerAlias.age_alias)), pg: { text : 'SELECT ("customer"."name" + "customer"."age") FROM "customer"', @@ -52,7 +52,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.plus('!')).where(post.userId. in (customer.subQuery().select(customer.id))), pg: { text : 'SELECT ("post"."content" + $1) FROM "post" WHERE ("post"."userId" IN (SELECT "customer"."id" FROM "customer"))', @@ -77,7 +77,7 @@ Harness.test({ params: ['!'] }); -Harness.test({ +Harness.it({ query: post.select(post.id.plus(': ').plus(post.content)).where(post.userId.notIn(customer.subQuery().select(customer.id))), pg: { text : 'SELECT (("post"."id" + $1) + "post"."content") FROM "post" WHERE ("post"."userId" NOT IN (SELECT "customer"."id" FROM "customer"))', diff --git a/test/dialects/case-tests.js b/test/dialects/case-tests.js index f492a4f5..4f643ef0 100644 --- a/test/dialects/case-tests.js +++ b/test/dialects/case-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); // Check case expression with primary when expressions and else branch. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([true, false], [0, 1], 2)), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END) FROM "customer"', @@ -32,7 +32,7 @@ Harness.test({ }); // Check case expression as a subexpression. -Harness.test({ +Harness.it({ query: customer.select(customer.age.plus(customer.age.case([true, false], [0, 1], 2))), pg: { text : 'SELECT ("customer"."age" + (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END)) FROM "customer"', @@ -60,7 +60,7 @@ Harness.test({ }); // Check case expression as subexpression on the left. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([true, false], [0, 1], 2).plus(3)), pg: { text : 'SELECT ((CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END) + $6) FROM "customer"', @@ -88,7 +88,7 @@ Harness.test({ }); // Check case expression with primary when expressions and compound else expression. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([true, false], [0, 1], customer.age.between(10, 20))), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE ("customer"."age" BETWEEN $5 AND $6) END) FROM "customer"', @@ -116,7 +116,7 @@ Harness.test({ }); // Check case expression with primary when expressions without else branch. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([true, false], [0, 1])), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 END) FROM "customer"', @@ -144,7 +144,7 @@ Harness.test({ }); // Check case expression with compound when expressions and else branch. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [0, 1], 2)), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN $4 WHEN ("customer"."age" <= $5) THEN $6 ELSE $7 END) FROM "customer"', @@ -170,7 +170,7 @@ Harness.test({ }); // Check case expression without else branch. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [0, 1])), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN $4 WHEN ("customer"."age" <= $5) THEN $6 END) FROM "customer"', @@ -196,7 +196,7 @@ Harness.test({ }); // Check case expression with compound then expressions. -Harness.test({ +Harness.it({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [customer.age.plus(5), customer.age.minus(1)])), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN ("customer"."age" + $4) WHEN ("customer"."age" <= $5) THEN ("customer"."age" - $6) END) FROM "customer"', diff --git a/test/dialects/cast-tests.js b/test/dialects/cast-tests.js index 2295d720..7f2974a8 100644 --- a/test/dialects/cast-tests.js +++ b/test/dialects/cast-tests.js @@ -5,7 +5,7 @@ var customer = Harness.defineCustomerTable(); var customerAlias = Harness.defineCustomerAliasTable(); // Cast columns. -Harness.test({ +Harness.it({ query: customer.select(customer.age.cast('int')), pg: { text : 'SELECT CAST("customer"."age" AS int) FROM "customer"', @@ -30,7 +30,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(customer.name.cast('varchar(10)')), pg: { text : 'SELECT CAST("customer"."name" AS varchar(10)) FROM "customer"', @@ -56,7 +56,7 @@ Harness.test({ }); // Cast binary expressions. -Harness.test({ +Harness.it({ query: customer.select(customer.name.plus(customer.age).cast('varchar(15)')), pg: { text : 'SELECT CAST(("customer"."name" + "customer"."age") AS varchar(15)) FROM "customer"', @@ -82,7 +82,7 @@ Harness.test({ }); // Cast cast expressions. -Harness.test({ +Harness.it({ query: customer.select(customer.name.cast('varchar(15)').cast('varchar(10)')), pg: { text : 'SELECT CAST(CAST("customer"."name" AS varchar(15)) AS varchar(10)) FROM "customer"', @@ -108,7 +108,7 @@ Harness.test({ }); // Cast in WHERE. -Harness.test({ +Harness.it({ query: customer.select(customer.name).where(customer.age.cast('int').plus(100).equals(150)), pg: { text : 'SELECT "customer"."name" FROM "customer" WHERE ((CAST("customer"."age" AS int) + $1) = $2)', @@ -134,7 +134,7 @@ Harness.test({ }); // Alias cast. -Harness.test({ +Harness.it({ query: customer.select(customer.age.cast('int').as('age_int')), pg: { text : 'SELECT CAST("customer"."age" AS int) AS "age_int" FROM "customer"', @@ -160,7 +160,7 @@ Harness.test({ }); // Cast Aliased columns. -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.age_alias.cast('int')), pg: { text : 'SELECT CAST("customer"."age" AS int) FROM "customer"', @@ -185,7 +185,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.name_alias.cast('varchar(10)')), pg: { text : 'SELECT CAST("customer"."name" AS varchar(10)) FROM "customer"', @@ -210,7 +210,7 @@ Harness.test({ params: [] }); // Cast binary expressions for Aliased Column. -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.name_alias.plus(customerAlias.age_alias).cast('varchar(15)')), pg: { text : 'SELECT CAST(("customer"."name" + "customer"."age") AS varchar(15)) FROM "customer"', @@ -236,7 +236,7 @@ Harness.test({ }); // Cast cast expressions for aliased columns. -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.name_alias.cast('varchar(15)').cast('varchar(10)')), pg: { text : 'SELECT CAST(CAST("customer"."name" AS varchar(15)) AS varchar(10)) FROM "customer"', @@ -262,7 +262,7 @@ Harness.test({ }); // Cast in WHERE for aliased columns. -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.name_alias).where(customerAlias.age_alias.cast('int').plus(100).equals(150)), pg: { text : 'SELECT "customer"."name" AS "name_alias" FROM "customer" WHERE ((CAST("customer"."age" AS int) + $1) = $2)', @@ -288,7 +288,7 @@ Harness.test({ }); // Alias cast. -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.age_alias.cast('int').as('age_int')), pg: { text : 'SELECT CAST("customer"."age" AS int) AS "age_int" FROM "customer"', diff --git a/test/dialects/clause-ordering-tests.js b/test/dialects/clause-ordering-tests.js index 83d2d28e..dbc0bd51 100644 --- a/test/dialects/clause-ordering-tests.js +++ b/test/dialects/clause-ordering-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); // FROM - SELECT -Harness.test({ +Harness.it({ query: user.from(user.join(post).on(user.id.equals(post.userId))).select(user.name, post.content), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -31,7 +31,7 @@ Harness.test({ }); // WHERE - FROM - SELECT -Harness.test({ +Harness.it({ query: user.where({ name: '' }).from(user).select(user.id), @@ -59,7 +59,7 @@ Harness.test({ }); // SELECT - FROM - WHERE -Harness.test({ +Harness.it({ query: user .select(user.name, post.content) .from(user.join(post).on(user.id.equals(post.userId))) @@ -90,7 +90,7 @@ Harness.test({ }); // SELECT - FROM - WHERE -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where({ name: '' }), diff --git a/test/dialects/create-table-tests.js b/test/dialects/create-table-tests.js index b1150617..0e44679c 100644 --- a/test/dialects/create-table-tests.js +++ b/test/dialects/create-table-tests.js @@ -15,7 +15,7 @@ var group = Table.define({ ] }); -Harness.test({ +Harness.it({ query: group.create(), pg: { text : 'CREATE TABLE "group" ("id" varchar(100), "user_id" varchar(100))', @@ -40,7 +40,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: group.create().ifNotExists(), pg: { text : 'CREATE TABLE IF NOT EXISTS "group" ("id" varchar(100), "user_id" varchar(100))', @@ -65,7 +65,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -97,7 +97,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -129,7 +129,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -162,7 +162,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -193,7 +193,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -220,7 +220,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -248,7 +248,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'user', columns: [{ @@ -281,7 +281,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -314,7 +314,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'picture', columns: [{ @@ -349,7 +349,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'picture', columns: [{ @@ -381,7 +381,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -409,7 +409,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'membership', columns: { @@ -436,7 +436,7 @@ Harness.test({ // This tests explicitly setting the isTemporary flag to false, as opposed to all the test above here which have it // as undefined. -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -468,7 +468,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -511,7 +511,7 @@ var users = Table.define({ } }); -Harness.test({ +Harness.it({ query: users.create(), pg: { text: 'CREATE TABLE "users" ("id" int PRIMARY KEY REFERENCES "entity"("id") DEFERRABLE INITIALLY DEFERRED)', @@ -537,7 +537,7 @@ Harness.test({ }); // UNIQUE COLUMN TESTS -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -587,7 +587,7 @@ var noUsers = Table.define({ } }); -Harness.test({ +Harness.it({ query: noUsers.create(), pg: { text : 'CREATE TABLE "no_users" ("id" int PRIMARY KEY REFERENCES "entity"("id"))', @@ -612,7 +612,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -646,7 +646,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -680,7 +680,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'post', columns: [{ @@ -715,7 +715,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Table.define({ name: 'replies', columns: [{ diff --git a/test/dialects/create-view-tests.js b/test/dialects/create-view-tests.js index 977f540a..feaa4c71 100644 --- a/test/dialects/create-view-tests.js +++ b/test/dialects/create-view-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); //simple view create -Harness.test({ +Harness.it({ query: user.select(user.star()).createView('allUsersView'), pg: { text : '(CREATE VIEW "allUsersView" AS SELECT "user".* FROM "user")', @@ -29,7 +29,7 @@ Harness.test({ }); //create view with parameters -Harness.test({ +Harness.it({ query: user.select(user.star()).where(user.id.equals(1)).createView('oneUserView'), pg: { text : '(CREATE VIEW "oneUserView" AS SELECT "user".* FROM "user" WHERE ("user"."id" = 1))', @@ -54,7 +54,7 @@ Harness.test({ }); //Tests error raised for non-SELECT create view attempts -Harness.test({ +Harness.it({ query: user.delete().where(user.id.equals(1)).createView('oneUserView'), pg: { text : 'Create View requires a Select.', diff --git a/test/dialects/date-tests.js b/test/dialects/date-tests.js index dd2c4d64..8637949d 100644 --- a/test/dialects/date-tests.js +++ b/test/dialects/date-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib'); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.YEAR(customer.metadata)), pg: { text : 'SELECT EXTRACT(YEAR FROM "customer"."metadata") FROM "customer"', @@ -29,7 +29,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.MONTH(customer.metadata)), pg: { text : 'SELECT EXTRACT(MONTH FROM "customer"."metadata") FROM "customer"', @@ -57,7 +57,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.DAY(customer.metadata)), pg: { text : 'SELECT EXTRACT(DAY FROM "customer"."metadata") FROM "customer"', @@ -82,7 +82,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.HOUR(customer.metadata)), pg: { text : 'SELECT EXTRACT(HOUR FROM "customer"."metadata") FROM "customer"', @@ -110,7 +110,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(Sql.functions.CURRENT_TIMESTAMP()), pg: { text : 'SELECT CURRENT_TIMESTAMP FROM "customer"', @@ -135,7 +135,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:1}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'1 HOUR\')', @@ -148,7 +148,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years:3}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'3 YEAR\')', @@ -161,7 +161,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years:3, months:2}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'3 YEAR 2 MONTH\')', @@ -174,7 +174,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:1, minutes:20}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'1 HOUR 20 MINUTE\')', @@ -187,7 +187,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:'sql\'injection', minutes:20}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'20 MINUTE\')', @@ -200,7 +200,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({days: 1, hours:5, minutes: 'sql\'injection'}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'1 DAY 5 HOUR\')', @@ -213,7 +213,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years: 2, months: 5}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'2 YEAR 5 MONTH\')', diff --git a/test/dialects/delete-tests.js b/test/dialects/delete-tests.js index 51fe3026..cbcee36e 100644 --- a/test/dialects/delete-tests.js +++ b/test/dialects/delete-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: post.delete().where(post.content.equals("hello's world")), pg: { text : 'DELETE FROM "post" WHERE ("post"."content" = $1)', @@ -29,7 +29,7 @@ Harness.test({ params: ["hello's world"] }); -Harness.test({ +Harness.it({ query: post.delete(post).from(post), pg: { text: 'DELETE "post" FROM "post"', @@ -46,7 +46,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.delete([post, post]).from(post), pg: { text: 'DELETE "post", "post" FROM "post"', @@ -63,7 +63,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user .delete(user) .from(user.join(post).on(post.userId.equals(user.id))) @@ -87,7 +87,7 @@ Harness.test({ params: [ 'foo' ] }); -Harness.test({ +Harness.it({ query: post.delete().where({ content: '' }), @@ -114,7 +114,7 @@ Harness.test({ params: [''] }); -Harness.test({ +Harness.it({ query: post.delete({ content: '' }), @@ -141,7 +141,7 @@ Harness.test({ params: [''] }); -Harness.test({ +Harness.it({ query: post.delete({ content: '' }).or(post.content.isNull()), diff --git a/test/dialects/distinct-on-tests.js b/test/dialects/distinct-on-tests.js index d238f928..144a0c6e 100644 --- a/test/dialects/distinct-on-tests.js +++ b/test/dialects/distinct-on-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: user.select().distinctOn(user.id), pg: { text : 'SELECT DISTINCT ON("user"."id") "user".* FROM "user"', @@ -13,7 +13,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id,user.name).distinctOn(user.id), pg: { text : 'SELECT DISTINCT ON("user"."id") "user"."id", "user"."name" FROM "user"', diff --git a/test/dialects/distinct-tests.js b/test/dialects/distinct-tests.js index 9f922bff..e9210a7e 100644 --- a/test/dialects/distinct-tests.js +++ b/test/dialects/distinct-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: user.select(user.id.distinct()), pg: { text : 'SELECT DISTINCT("user"."id") FROM "user"', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id.count().distinct().as('count')), pg: { text : 'SELECT COUNT(DISTINCT("user"."id")) AS "count" FROM "user"', @@ -55,7 +55,7 @@ Harness.test({ // BELOW HERE TEST DISTINCT ON THE ENTIRE RESULTS SET, NOT JUST ONE COLUMN -Harness.test({ +Harness.it({ query: user.select().distinct(), pg: { text : 'SELECT DISTINCT "user".* FROM "user"', @@ -80,7 +80,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id).distinct(), pg: { text : 'SELECT DISTINCT "user"."id" FROM "user"', @@ -105,7 +105,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id,user.name).distinct(), pg: { text : 'SELECT DISTINCT "user"."id", "user"."name" FROM "user"', diff --git a/test/dialects/drop-table-tests.js b/test/dialects/drop-table-tests.js index eb183e64..4c986b25 100644 --- a/test/dialects/drop-table-tests.js +++ b/test/dialects/drop-table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.drop(), pg: { text : 'DROP TABLE "post"', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.drop().ifExists(), pg: { text : 'DROP TABLE IF EXISTS "post"', @@ -53,7 +53,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.drop().cascade(), pg: { text : 'DROP TABLE "post" CASCADE', @@ -74,7 +74,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.drop().restrict(), pg: { text : 'DROP TABLE "post" RESTRICT', diff --git a/test/dialects/for-share-tests.js b/test/dialects/for-share-tests.js index 4b9627fa..41afc727 100644 --- a/test/dialects/for-share-tests.js +++ b/test/dialects/for-share-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: post.select(post.star()).forShare(), pg: { text : 'SELECT "post".* FROM "post" FOR SHARE', @@ -13,7 +13,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).from(post.join(user).on(user.id.equals(post.userId))).where(post.content.equals('foo')).forShare(), pg: { text : 'SELECT "post".* FROM "post" INNER JOIN "user" ON ("user"."id" = "post"."userId") WHERE ("post"."content" = $1) FOR SHARE', diff --git a/test/dialects/for-update-tests.js b/test/dialects/for-update-tests.js index 19a01e20..e2b1d610 100644 --- a/test/dialects/for-update-tests.js +++ b/test/dialects/for-update-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: post.select(post.star()).forUpdate(), pg: { text : 'SELECT "post".* FROM "post" FOR UPDATE', @@ -17,7 +17,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).from(post.join(user).on(user.id.equals(post.userId))).where(post.content.equals('foo')).forUpdate(), pg: { text : 'SELECT "post".* FROM "post" INNER JOIN "user" ON ("user"."id" = "post"."userId") WHERE ("post"."content" = $1) FOR UPDATE', diff --git a/test/dialects/from-clause-tests.js b/test/dialects/from-clause-tests.js index 673087db..1883124e 100644 --- a/test/dialects/from-clause-tests.js +++ b/test/dialects/from-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user).from(post), pg: { text : 'SELECT "user".* FROM "user" , "post"', @@ -28,7 +28,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: user.select(user.star(), post.star()).from(user).from(post), pg: { text : 'SELECT "user".*, "post".* FROM "user" , "post"', @@ -52,7 +52,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user, post), pg: { text : 'SELECT "user".* FROM "user" , "post"', @@ -72,7 +72,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: user.select(user.star()).from([user, post]), pg: { text : 'SELECT "user".* FROM "user" , "post"', diff --git a/test/dialects/function-tests.js b/test/dialects/function-tests.js index 702d8c63..35182156 100644 --- a/test/dialects/function-tests.js +++ b/test/dialects/function-tests.js @@ -5,7 +5,7 @@ var Sql = require('../../lib'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.select(Sql.functions.LENGTH(post.content)), pg: { text : 'SELECT LENGTH("post"."content") FROM "post"', @@ -30,7 +30,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(Sql.functions.LEFT(post.content,4)), pg: { text : 'SELECT LEFT("post"."content", $1) FROM "post"', @@ -55,7 +55,7 @@ Harness.test({ params: [4] }); -Harness.test({ +Harness.it({ query: post.select(Sql.functions.RIGHT(post.content,4)), pg: { text : 'SELECT RIGHT("post"."content", $1) FROM "post"', diff --git a/test/dialects/group-by-tests.js b/test/dialects/group-by-tests.js index 673b5639..f59085b1 100644 --- a/test/dialects/group-by-tests.js +++ b/test/dialects/group-by-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.select(post.content).group(post.userId), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId"', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).group(post.userId, post.id), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId", "post"."id"', @@ -53,7 +53,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.arrayAgg()).group(post.userId), pg: { text : 'SELECT array_agg("post"."content") AS "contents" FROM "post" GROUP BY "post"."userId"', @@ -78,7 +78,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.arrayAgg('post contents')).group(post.userId), pg: { text : 'SELECT array_agg("post"."content") AS "post contents" FROM "post" GROUP BY "post"."userId"', @@ -103,7 +103,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).group([post.userId, post.id]), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId", "post"."id"', diff --git a/test/dialects/having-tests.js b/test/dialects/having-tests.js index 5f8f9cc7..35d5f765 100644 --- a/test/dialects/having-tests.js +++ b/test/dialects/having-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query : post.select(post.userId, post.content.count()).group(post.userId).having(post.userId.gt(10)), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1)', @@ -28,7 +28,7 @@ Harness.test({ params: [10] }); -Harness.test({ +Harness.it({ query : post.select(post.userId, post.content.count()).group(post.userId).having(post.userId.gt(10), post.userId.lt(100)), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1) AND ("post"."userId" < $2)', @@ -53,7 +53,7 @@ Harness.test({ params: [10, 100] }); -Harness.test({ +Harness.it({ query : post.select(post.userId, post.content.count()).group(post.userId).having([post.userId.gt(10), post.userId.lt(100)]), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1) AND ("post"."userId" < $2)', diff --git a/test/dialects/hstore-tests.js b/test/dialects/hstore-tests.js index 54ba2d22..bdaeaa70 100644 --- a/test/dialects/hstore-tests.js +++ b/test/dialects/hstore-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: customer.update({ metadata: customer.metadata.concat(Sql.functions.HSTORE('age', 20)) }), @@ -15,7 +15,7 @@ Harness.test({ params: ['age', 20] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.key('age')), pg: { text : 'SELECT ("customer"."metadata" -> $1) FROM "customer"', diff --git a/test/dialects/ilike-tests.js b/test/dialects/ilike-tests.js index aba487ee..58d353ca 100644 --- a/test/dialects/ilike-tests.js +++ b/test/dialects/ilike-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var user = Harness.defineUserTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: post.select(post.content, post.userId).where(post.content.ilike('A%')), pg: { text : 'SELECT "post"."content", "post"."userId" FROM "post" WHERE ("post"."content" ILIKE $1)', @@ -14,7 +14,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.ilike('A%')), pg: { @@ -24,7 +24,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.ilike('A%')), pg: { @@ -34,7 +34,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId) .select(user.id).from(user).where(user.name.ilike('A%')), pg: { diff --git a/test/dialects/in-clause-tests.js b/test/dialects/in-clause-tests.js index 513c7243..ccae8799 100644 --- a/test/dialects/in-clause-tests.js +++ b/test/dialects/in-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([])), pg: { text : 'SELECT "post".* FROM "post" WHERE (1=0)', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([1])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1))', @@ -53,7 +53,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NULL)', @@ -78,7 +78,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([1, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2))', @@ -103,7 +103,7 @@ Harness.test({ params: [1, 2] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([null, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NULL)', @@ -128,7 +128,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([1, null, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2) OR "post"."id" IS NULL)', @@ -153,7 +153,7 @@ Harness.test({ params: [1, 2] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.in([1, null, 2, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2) OR "post"."id" IS NULL)', diff --git a/test/dialects/indexes-tests.js b/test/dialects/indexes-tests.js index 86b50449..8f518a0e 100644 --- a/test/dialects/indexes-tests.js +++ b/test/dialects/indexes-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.indexes(), pg: { text : 'SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname=\'post\' AND pg_class.relnamespace IN (SELECT pg_namespace.oid FROM pg_namespace WHERE nspname = \'public\') AND pg_class.oid=pg_index.indrelid)', @@ -24,7 +24,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create('index_name').unique().using('btree').on(post.id, post.userId).withParser('foo'), pg: { text : 'CREATE UNIQUE INDEX "index_name" USING BTREE ON "post" ("id","userId") WITH PARSER foo', @@ -45,7 +45,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().fulltext().on(post.id), pg: { text : 'CREATE FULLTEXT INDEX "post_id" ON "post" ("id")', @@ -62,7 +62,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().spatial().on(post.id), pg: { text : 'CREATE SPATIAL INDEX "post_id" ON "post" ("id")', @@ -79,7 +79,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().on(post.userId, post.id), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id")', @@ -100,7 +100,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().on(post.userId).on(post.id), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id")', @@ -121,7 +121,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().on(post.userId, post.id.desc), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id" DESC)', @@ -146,7 +146,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().create().on(post.userId).on(post.id.descending), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id" DESC)', @@ -172,7 +172,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: post.indexes().create(), pg: { text : 'No columns defined!', @@ -192,7 +192,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: post.indexes().drop('index_name'), pg: { text : 'DROP INDEX "public"."index_name"', @@ -213,7 +213,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.indexes().drop(post.userId, post.id), pg: { text : 'DROP INDEX "public"."post_id_userId"', diff --git a/test/dialects/insert-tests.js b/test/dialects/insert-tests.js index 60ba6a62..11af31f9 100644 --- a/test/dialects/insert-tests.js +++ b/test/dialects/insert-tests.js @@ -11,7 +11,7 @@ var arrayTable = require('../../lib/table').define({ columns: ['id', 'numbers'] }); -Harness.test({ +Harness.it({ query: post.insert(post.content.value('test'), post.userId.value(1)), pg: { text : 'INSERT INTO "post" ("content", "userId") VALUES ($1, $2)', @@ -32,7 +32,7 @@ Harness.test({ params: ['test', 1] }); -Harness.test({ +Harness.it({ query: post.insert(post.content.value('whoah')), pg: { text : 'INSERT INTO "post" ("content") VALUES ($1)', @@ -57,7 +57,7 @@ Harness.test({ params: ['whoah'] }); -Harness.test({ +Harness.it({ query: post.insert({length: 0}), pg: { text : 'INSERT INTO "post" ("length") VALUES ($1)', @@ -82,7 +82,7 @@ Harness.test({ params: [0] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -106,7 +106,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: post.sql.functions.LOWER('TEST'), userId: 2 @@ -131,7 +131,7 @@ Harness.test({ }); // allow bulk insert -Harness.test({ +Harness.it({ query: post.insert([{ content: 'whoah' }, { @@ -157,7 +157,7 @@ Harness.test({ params: ['whoah', 'hey'] }); -Harness.test({ +Harness.it({ query: post.insert([{ content: 'whoah', userId: 1 @@ -186,7 +186,7 @@ Harness.test({ }); // consistent order -Harness.test({ +Harness.it({ query: post.insert([{ content: 'whoah', userId: 1 @@ -218,7 +218,7 @@ Harness.test({ params: ['whoah', 1, 'hey', 2] }); -Harness.test({ +Harness.it({ query: post.insert({}), pg: { text : 'INSERT INTO "post" DEFAULT VALUES', @@ -243,7 +243,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert({}).returning('*'), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING *', @@ -264,7 +264,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert({}).returning(post.star()), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING *', @@ -285,7 +285,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert({}).returning(post.id), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id"', @@ -306,7 +306,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert({}).returning(post.id, post.content), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id", "content"', @@ -327,7 +327,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert({}).returning([post.id, post.content]), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id", "content"', @@ -349,7 +349,7 @@ Harness.test({ }); // handle missing columns -Harness.test({ +Harness.it({ query: post.insert([{ content: 'whoah', userId: 1 @@ -383,7 +383,7 @@ Harness.test({ }, }); -Harness.test({ +Harness.it({ query: post.insert([{ userId: 1 }, { @@ -417,7 +417,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: post.insert(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -443,7 +443,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -469,7 +469,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId) .select(user.id).from(user).where(user.name.like('A%')), pg: { @@ -491,7 +491,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId) .select(post.userId).from(user.join(post).on(user.id.equals(post.userId))).where(post.tags.like('A%')), pg: { @@ -517,7 +517,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).select(user.id).distinct().from(user), pg: { text : 'INSERT INTO "post" ("userId") SELECT DISTINCT "user"."id" FROM "user"', @@ -543,7 +543,7 @@ Harness.test({ }); // Binary inserts -Harness.test({ +Harness.it({ query: post.insert(post.content.value(new Buffer('test')), post.userId.value(2)), pg: { text : 'INSERT INTO "post" ("content", "userId") VALUES ($1, $2)', @@ -568,7 +568,7 @@ Harness.test({ params: [new Buffer('test'), 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: new Buffer('test'), userId: 2 @@ -596,7 +596,7 @@ Harness.test({ params: [new Buffer('test'), 2] }); -Harness.test({ +Harness.it({ query: post.insert([{ content: new Buffer('whoah') }, { @@ -627,7 +627,7 @@ Harness.test({ params: [new Buffer('whoah'), new Buffer('hey')] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -653,7 +653,7 @@ Harness.test({ params: ['test', 2, 'testupdate'] }); -Harness.test({ +Harness.it({ query: customerAliasTable.insert({ id : 2, name : 'test' @@ -680,7 +680,7 @@ Harness.test({ params: [2, 'test'] }); -Harness.test({ +Harness.it({ query: customerAliasTable.insert({ id : 2, name : 'test' @@ -704,7 +704,7 @@ Harness.test({ params: [2, 'test'] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -731,7 +731,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -758,7 +758,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -785,7 +785,7 @@ Harness.test({ params: ['test', 2, 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -812,7 +812,7 @@ Harness.test({ params: ['test', 2, 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -838,7 +838,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.insert({ content: 'test', userId: 2 @@ -864,7 +864,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: contentTable.insert({ contentId: 20, text : "something" @@ -890,7 +890,7 @@ Harness.test({ params: [20, "something"] }); -Harness.test({ +Harness.it({ query: contentTable.insert({ contentId: 20, text : "something", @@ -918,7 +918,7 @@ Harness.test({ params: [20, "something", "another thing"] }); -Harness.test({ +Harness.it({ query: post.insert([]), mysql: { @@ -928,7 +928,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value([2, 3, 4])), pg: { text : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)', @@ -948,7 +948,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value(["one", "two", "three"])), pg: { text : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)', @@ -968,7 +968,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).select(user.id).from(user), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -993,7 +993,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).select(user.id).from(user).onConflict({ columns: ['userId'], update: ['content'] @@ -1017,7 +1017,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).add(user.select(user.id)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -1042,7 +1042,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).add(user.select(user.id).from(user)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -1067,7 +1067,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.insert(post.userId).add(user.select(user.id).order(user.id)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user" ORDER BY "user"."id"', diff --git a/test/dialects/join-tests.js b/test/dialects/join-tests.js index 2e0c6882..db97b905 100644 --- a/test/dialects/join-tests.js +++ b/test/dialects/join-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var comment = Harness.defineCommentTable(); -Harness.test({ +Harness.it({ query: user.select(user.name, post.content).from(user.join(post).on(user.id.equals(post.userId))), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -30,7 +30,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.join(post).on(user.id.equals(post.userId)), pg: { text : '"user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -55,7 +55,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user .select(user.name, post.content, comment.text) .from( @@ -85,7 +85,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.name, post.content).from(user.leftJoin(post).on(user.id.equals(post.userId))), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" LEFT JOIN "post" ON ("user"."id" = "post"."userId")', @@ -110,7 +110,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user .select(user.name, post.content) .from( @@ -147,7 +147,7 @@ var subposts = post post.userId.as('subpostUserId')) .from(post); -Harness.test({ +Harness.it({ query: user .select(user.name, subposts.content) .from(user.join(subposts) @@ -175,7 +175,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select().from(user.leftJoinLateral(post.subQuery().select(post.userId))), pg: { text : 'SELECT "user".* FROM "user" LEFT JOIN LATERAL (SELECT "post"."userId" FROM "post") ON true', @@ -192,7 +192,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select().from(user.leftJoinLateral(post.subQuery().select(post.userId).where(user.id.equals(post.userId)))), pg: { text : 'SELECT "user".* FROM "user" LEFT JOIN LATERAL (SELECT "post"."userId" FROM "post" WHERE ("user"."id" = "post"."userId")) ON true', @@ -209,7 +209,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select().from(user .leftJoinLateral(post.subQuery().select(post.userId)) .leftJoinLateral(comment.subQuery().select(comment.postId))), diff --git a/test/dialects/join-to-tests.js b/test/dialects/join-to-tests.js index d50f8817..b70c16a8 100644 --- a/test/dialects/join-to-tests.js +++ b/test/dialects/join-to-tests.js @@ -36,7 +36,7 @@ var post = sql.define({ } }); -Harness.test({ +Harness.it({ query: user.joinTo(post), pg: { text : '"user" INNER JOIN "post" ON ("user"."id" = "post"."ownerId")', @@ -61,7 +61,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.joinTo(user), pg: { text : '"post" INNER JOIN "user" ON ("user"."id" = "post"."ownerId")', @@ -86,7 +86,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.joinTo(photo), pg: { text : '"user" INNER JOIN "photo" ON ("user"."id" = "photo"."ownerId")', diff --git a/test/dialects/json-tests.js b/test/dialects/json-tests.js index b610b96f..b539ddba 100644 --- a/test/dialects/json-tests.js +++ b/test/dialects/json-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.key('age')), pg: { text : 'SELECT ("customer"."metadata" -> $1) FROM "customer"', @@ -13,7 +13,7 @@ Harness.test({ params: ['age'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.keyText('age')), pg: { text : 'SELECT ("customer"."metadata" ->> $1) FROM "customer"', @@ -22,7 +22,7 @@ Harness.test({ params: ['age'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.path('{address,city}')), pg: { text : 'SELECT ("customer"."metadata" #> $1) FROM "customer"', @@ -31,7 +31,7 @@ Harness.test({ params: ['{address,city}'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.pathText('{address,city}')), pg: { text : 'SELECT ("customer"."metadata" #>> $1) FROM "customer"', diff --git a/test/dialects/limit-and-offset-tests.js b/test/dialects/limit-and-offset-tests.js index 6561c14b..9e29809d 100644 --- a/test/dialects/limit-and-offset-tests.js +++ b/test/dialects/limit-and-offset-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); // For compatibility with PostgreSQL, MySQL also supports the LIMIT row_count OFFSET offset syntax. // http://dev.mysql.com/doc/refman/5.0/en/select.html -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user).order(user.name.asc).limit(1), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" LIMIT 1', @@ -27,7 +27,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user).order(user.name.asc).limit(3).offset(6), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" LIMIT 3 OFFSET 6', @@ -48,7 +48,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user).order(user.name.asc).offset(10), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" OFFSET 10', @@ -73,7 +73,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star()).where({ name: 'John' }).offset(user.subQuery().select('FLOOR(RANDOM() * COUNT(*))').where({ diff --git a/test/dialects/literal-tests.js b/test/dialects/literal-tests.js index c31d4271..c7e3bdff 100644 --- a/test/dialects/literal-tests.js +++ b/test/dialects/literal-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: user.select(user.literal('foo'), user.name, user.literal('123').as('onetwothree')), pg: { text : 'SELECT foo, "user"."name", 123 AS "onetwothree" FROM "user"', @@ -25,7 +25,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: user.select().where(user.literal('foo = bar')), pg: { text : 'SELECT "user".* FROM "user" WHERE foo = bar', @@ -50,7 +50,7 @@ Harness.test({ // This could be less than 10 (the limit) if we are on the last page. var subquery = user.subQuery('subquery_for_count').select(user.literal(1).as('count_column')).limit(10).offset(20); -Harness.test({ +Harness.it({ query: user.select(subquery.count_column.count()).from(subquery), pg: { text : 'SELECT COUNT("subquery_for_count"."count_column") AS "count_column_count" FROM (SELECT 1 AS "count_column" FROM "user" LIMIT 10 OFFSET 20) "subquery_for_count"', diff --git a/test/dialects/matches-test.js b/test/dialects/matches-test.js index c385641c..d26cad38 100644 --- a/test/dialects/matches-test.js +++ b/test/dialects/matches-test.js @@ -6,7 +6,7 @@ var customerAlias = Harness.defineCustomerAliasTable(); var sql = require(__dirname + '/../../lib').setDialect('postgres'); //Postgres needs the to_tsquery function to use with @@ operator -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.content.match(sql.functions.TO_TSQUERY('hello'))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."content" @@ TO_TSQUERY($1))', @@ -16,7 +16,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.content.match('hello')), sqlite: { text : 'SELECT "post".* FROM "post" WHERE ("post"."content" MATCH $1)', @@ -38,7 +38,7 @@ Harness.test({ }); //matches, ordered by best rank first -Harness.test({ +Harness.it({ query: post.select(post.id, sql.functions.TS_RANK_CD(post.content, sql.functions.TO_TSQUERY('hello')).as('rank')). where(post.content.match(sql.functions.TO_TSQUERY('hello'))).order(sql.functions.TS_RANK_CD(post.content, sql.functions.TO_TSQUERY('hello')).descending()), pg: { diff --git a/test/dialects/namespace-tests.js b/test/dialects/namespace-tests.js index 5f6b4a56..ed6800bf 100644 --- a/test/dialects/namespace-tests.js +++ b/test/dialects/namespace-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var u = user.as('u'); -Harness.test({ +Harness.it({ query: u.select(u.name).from(u), pg: { text : 'SELECT "u"."name" FROM "user" AS "u"', @@ -31,7 +31,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: u.select(u.star()).from(u), pg: { text : 'SELECT "u".* FROM "user" AS "u"', @@ -57,7 +57,7 @@ Harness.test({ }); var p = post.as('p'); -Harness.test({ +Harness.it({ query: u.select(u.name).from(u.join(p).on(u.id.equals(p.userId).and(p.id.equals(3)))), pg: { text : 'SELECT "u"."name" FROM "user" AS "u" INNER JOIN "post" AS "p" ON (("u"."id" = "p"."userId") AND ("p"."id" = $1))', @@ -82,7 +82,7 @@ Harness.test({ params: [3] }); -Harness.test({ +Harness.it({ query: u.select(p.content, u.name).from(u.join(p).on(u.id.equals(p.userId).and(p.content.isNotNull()))), pg: { text : 'SELECT "p"."content", "u"."name" FROM "user" AS "u" INNER JOIN "post" AS "p" ON (("u"."id" = "p"."userId") AND ("p"."content" IS NOT NULL))', @@ -120,7 +120,7 @@ var comment = Table.define({ ] }); -Harness.test({ +Harness.it({ query: comment.select(comment.text, comment.userId), pg: { text : 'SELECT "comment"."text", "comment"."userId" FROM "comment"', diff --git a/test/dialects/not-in-clause-tests.js b/test/dialects/not-in-clause-tests.js index 11647fee..753a845d 100644 --- a/test/dialects/not-in-clause-tests.js +++ b/test/dialects/not-in-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([])), pg: { text : 'SELECT "post".* FROM "post" WHERE (1=1)', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([1])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" NOT IN ($1))', @@ -53,7 +53,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NOT NULL)', @@ -78,7 +78,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([1, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" NOT IN ($1, $2))', @@ -103,7 +103,7 @@ Harness.test({ params: [1, 2] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([null, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NOT NULL)', @@ -128,7 +128,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([1, null, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE (NOT ("post"."id" IN ($1, $2) OR "post"."id" IS NULL))', @@ -153,7 +153,7 @@ Harness.test({ params: [1, 2] }); -Harness.test({ +Harness.it({ query: post.select(post.star()).where(post.id.notIn([1, null, 2, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE (NOT ("post"."id" IN ($1, $2) OR "post"."id" IS NULL))', diff --git a/test/dialects/order-tests.js b/test/dialects/order-tests.js index a0813d8e..89addda0 100644 --- a/test/dialects/order-tests.js +++ b/test/dialects/order-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var sql = require('../../lib'); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content"', @@ -29,7 +29,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content, post.userId.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -54,7 +54,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content.asc, post.userId.desc), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -79,7 +79,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order([post.content, post.userId.descending]), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -104,7 +104,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content).order(post.userId.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -129,7 +129,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.isNull()).order(post.content.isNull()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL)', @@ -154,7 +154,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.isNull()).order(post.content.isNull().descending()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL) DESC', @@ -179,7 +179,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content.isNull()).order(post.content.isNull()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL)', @@ -204,7 +204,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(sql.functions.RTRIM(post.content)).order(sql.functions.RTRIM(post.content)), pg: { text : 'SELECT RTRIM("post"."content") FROM "post" ORDER BY RTRIM("post"."content")', @@ -229,7 +229,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(sql.functions.RTRIM(post.content)).order(sql.functions.RTRIM(post.content).descending()), pg: { text : 'SELECT RTRIM("post"."content") FROM "post" ORDER BY RTRIM("post"."content") DESC', @@ -254,7 +254,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" DESC NULLS LAST', @@ -282,7 +282,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" NULLS LAST', @@ -310,7 +310,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order(post.content.asc), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" NULLS FIRST', @@ -338,7 +338,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).order([]), pg: { text : 'SELECT "post"."content" FROM "post"', diff --git a/test/dialects/regex-tests.js b/test/dialects/regex-tests.js index 40dde618..a98c6697 100644 --- a/test/dialects/regex-tests.js +++ b/test/dialects/regex-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.regex('age')), pg: { text : 'SELECT ("customer"."metadata" ~ $1) FROM "customer"', @@ -13,7 +13,7 @@ Harness.test({ params: ['age'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.iregex('age')), pg: { text : 'SELECT ("customer"."metadata" ~* $1) FROM "customer"', @@ -22,7 +22,7 @@ Harness.test({ params: ['age'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.notRegex('age')), pg: { text : 'SELECT ("customer"."metadata" !~ $1) FROM "customer"', @@ -31,7 +31,7 @@ Harness.test({ params: ['age'] }); -Harness.test({ +Harness.it({ query: customer.select(customer.metadata.notIregex('age')), pg: { text : 'SELECT ("customer"."metadata" !~* $1) FROM "customer"', diff --git a/test/dialects/replace-tests.js b/test/dialects/replace-tests.js index 72af0e4b..9b780e7f 100644 --- a/test/dialects/replace-tests.js +++ b/test/dialects/replace-tests.js @@ -11,7 +11,7 @@ var arrayTable = require('../../lib/table').define({ columns: ['id', 'numbers'] }); -Harness.test({ +Harness.it({ query: post.replace(post.content.value('test'), post.userId.value(1)), pg: { throws: true @@ -33,7 +33,7 @@ Harness.test({ params: ['test', 1] }); -Harness.test({ +Harness.it({ query: post.replace(post.content.value('whoah')), pg: { throws: true @@ -55,7 +55,7 @@ Harness.test({ params: ['whoah'] }); -Harness.test({ +Harness.it({ query: post.replace({length: 0}), pg: { throws: true @@ -77,7 +77,7 @@ Harness.test({ params: [0] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -98,7 +98,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: post.sql.functions.LOWER('TEST'), userId: 2 @@ -120,7 +120,7 @@ Harness.test({ }); // allow bulk replace -Harness.test({ +Harness.it({ query: post.replace([{ content: 'whoah' }, { @@ -143,7 +143,7 @@ Harness.test({ params: ['whoah', 'hey'] }); -Harness.test({ +Harness.it({ query: post.replace([{ content: 'whoah', userId: 1 @@ -169,7 +169,7 @@ Harness.test({ }); // consistent order -Harness.test({ +Harness.it({ query: post.replace([{ content: 'whoah', userId: 1 @@ -198,7 +198,7 @@ Harness.test({ params: ['whoah', 1, 'hey', 2] }); -Harness.test({ +Harness.it({ query: post.replace({}), pg: { throws: true @@ -220,7 +220,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace({}).returning('*'), pg: { throws: true @@ -240,7 +240,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace({}).returning(post.star()), pg: { throws: true @@ -260,7 +260,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace({}).returning(post.id), pg: { throws: true @@ -280,7 +280,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace({}).returning(post.id, post.content), pg: { throws: true @@ -300,7 +300,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace({}).returning([post.id, post.content]), pg: { throws: true @@ -321,7 +321,7 @@ Harness.test({ }); // handle missing columns -Harness.test({ +Harness.it({ query: post.replace([{ content: 'whoah', userId: 1 @@ -349,7 +349,7 @@ Harness.test({ }, }); -Harness.test({ +Harness.it({ query: post.replace([{ userId: 1 }, { @@ -377,7 +377,7 @@ Harness.test({ }, }); -Harness.test({ +Harness.it({ query: post.replace(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -400,7 +400,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.replace([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -423,7 +423,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId) .select(user.id).from(user).where(user.name.like('A%')), pg: { @@ -442,7 +442,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId) .select(post.userId).from(user.join(post).on(user.id.equals(post.userId))).where(post.tags.like('A%')), pg: { @@ -465,7 +465,7 @@ Harness.test({ params: ['A%'] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).select(user.id).distinct().from(user), pg: { throws: true @@ -488,7 +488,7 @@ Harness.test({ }); // Binary replaces -Harness.test({ +Harness.it({ query: post.replace(post.content.value(new Buffer('test')), post.userId.value(2)), pg: { throws: true @@ -510,7 +510,7 @@ Harness.test({ params: [new Buffer('test'), 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: new Buffer('test'), userId: 2 @@ -535,7 +535,7 @@ Harness.test({ params: [new Buffer('test'), 2] }); -Harness.test({ +Harness.it({ query: post.replace([{ content: new Buffer('whoah') }, { @@ -562,7 +562,7 @@ Harness.test({ params: [new Buffer('whoah'), new Buffer('hey')] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -588,7 +588,7 @@ Harness.test({ params: ['test', 2, 'testupdate'] }); -Harness.test({ +Harness.it({ query: customerAliasTable.replace({ id : 2, name : 'test' @@ -614,7 +614,7 @@ Harness.test({ params: [2, 'test'] }); -Harness.test({ +Harness.it({ query: customerAliasTable.replace({ id : 2, name : 'test' @@ -638,7 +638,7 @@ Harness.test({ params: [2, 'test'] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -664,7 +664,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -690,7 +690,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -716,7 +716,7 @@ Harness.test({ params: ['test', 2, 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -742,7 +742,7 @@ Harness.test({ params: ['test', 2, 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -767,7 +767,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: post.replace({ content: 'test', userId: 2 @@ -792,7 +792,7 @@ Harness.test({ params: ['test', 2] }); -Harness.test({ +Harness.it({ query: contentTable.replace({ contentId: 20, text : "something" @@ -817,7 +817,7 @@ Harness.test({ params: [20, "something"] }); -Harness.test({ +Harness.it({ query: contentTable.replace({ contentId: 20, text : "something", @@ -844,7 +844,7 @@ Harness.test({ params: [20, "something", "another thing"] }); -Harness.test({ +Harness.it({ query: post.replace([]), mysql: { @@ -854,7 +854,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: arrayTable.replace(arrayTable.id.value(1), arrayTable.numbers.value([2, 3, 4])), pg: { throws: true @@ -871,7 +871,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: arrayTable.replace(arrayTable.id.value(1), arrayTable.numbers.value(["one", "two", "three"])), pg: { throws: true @@ -888,7 +888,7 @@ Harness.test({ } }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).select(user.id).from(user), pg: { throws: true @@ -910,7 +910,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).select(user.id).from(user).onConflict({ columns: ['userId'], update: ['content'] @@ -933,7 +933,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).add(user.select(user.id)), pg: { throws: true @@ -955,7 +955,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).add(user.select(user.id).from(user)), pg: { throws: true @@ -977,7 +977,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.replace(post.userId).add(user.select(user.id).order(user.id)), pg: { throws: true diff --git a/test/dialects/returning-tests.js b/test/dialects/returning-tests.js index ebbb0b2e..5ebff153 100644 --- a/test/dialects/returning-tests.js +++ b/test/dialects/returning-tests.js @@ -1,7 +1,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: user.insert({name: 'joe'}).returning(), pg: { text : 'INSERT INTO "user" ("name") VALUES ($1) RETURNING *', @@ -10,7 +10,7 @@ Harness.test({ params: ['joe'] }); -Harness.test({ +Harness.it({ query: user.insert({name: 'joe'}).returning('id'), pg: { text : 'INSERT INTO "user" ("name") VALUES ($1) RETURNING id', diff --git a/test/dialects/schema-tests.js b/test/dialects/schema-tests.js index 11e330da..05787630 100644 --- a/test/dialects/schema-tests.js +++ b/test/dialects/schema-tests.js @@ -10,7 +10,7 @@ var userWithSchema = Table.define({ columns: ['id', 'name'] }); -Harness.test({ +Harness.it({ query: userWithSchema.select(userWithSchema.id).from(userWithSchema), pg: { text : 'SELECT "staging"."user"."id" FROM "staging"."user"', @@ -35,7 +35,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: userWithSchema.select(userWithSchema.id.count()).from(userWithSchema), pg: { text : 'SELECT COUNT("staging"."user"."id") AS "id_count" FROM "staging"."user"', @@ -60,7 +60,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: userWithSchema.select(userWithSchema.id, userWithSchema.name).from(userWithSchema), pg: { text : 'SELECT "staging"."user"."id", "staging"."user"."name" FROM "staging"."user"', @@ -86,7 +86,7 @@ Harness.test({ }); var uws = userWithSchema.as('uws'); -Harness.test({ +Harness.it({ query: uws.select(uws.name).from(uws), pg: { text : 'SELECT "uws"."name" FROM "staging"."user" AS "uws"', @@ -117,7 +117,7 @@ var postWithSchema = Table.define({ columns: ['id', 'userId', 'content'] }); -Harness.test({ +Harness.it({ query: userWithSchema.select(userWithSchema.name, postWithSchema.content).from(userWithSchema.join(postWithSchema).on(userWithSchema.id.equals(postWithSchema.userId))), pg: { text : 'SELECT "staging"."user"."name", "dev"."post"."content" FROM "staging"."user" INNER JOIN "dev"."post" ON ("staging"."user"."id" = "dev"."post"."userId")', @@ -142,7 +142,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: uws.select(uws.name, postWithSchema.content).from(uws.join(postWithSchema).on(uws.id.equals(postWithSchema.userId))), pg: { text : 'SELECT "uws"."name", "dev"."post"."content" FROM "staging"."user" AS "uws" INNER JOIN "dev"."post" ON ("uws"."id" = "dev"."post"."userId")', diff --git a/test/dialects/select-tests.js b/test/dialects/select-tests.js index 2892c8ae..03ca6c53 100644 --- a/test/dialects/select-tests.js +++ b/test/dialects/select-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var customerAlias = Harness.defineCustomerAliasTable(); var Sql = require('../../lib'); -Harness.test({ +Harness.it({ query: post.select(post.id).select(post.content), pg: { text : 'SELECT "post"."id", "post"."content" FROM "post"', @@ -31,7 +31,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customerAlias.select(customerAlias.star()), pg: { text : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"', @@ -57,7 +57,7 @@ Harness.test({ }); // Test that we can generate a SELECT claus without a FROM clause -Harness.test({ +Harness.it({ query: Sql.select(), pg: { text : 'SELECT ', @@ -83,7 +83,7 @@ Harness.test({ }); // Test that we can generate a SELECT claus without a FROM clause -Harness.test({ +Harness.it({ query: Sql.select("1"), pg: { text : 'SELECT 1', @@ -108,7 +108,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select("1").where("1=1"), pg: { text : 'SELECT 1 WHERE (1=1)', @@ -133,7 +133,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(post.select(post.id)), pg: { text : 'SELECT (SELECT "post"."id" FROM "post")', @@ -158,7 +158,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(post.select(post.content).plus(post.select(post.content))), pg: { text : 'SELECT ((SELECT "post"."content" FROM "post") + (SELECT "post"."content" FROM "post"))', @@ -183,7 +183,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id.as('col1')), pg: { text : 'SELECT "post"."id" AS "col1" FROM "post"', @@ -208,7 +208,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(4)), pg: { text : 'SELECT $1 FROM "post"', @@ -233,7 +233,7 @@ Harness.test({ params: [4] }); -Harness.test({ +Harness.it({ query: post.select(post.id,Sql.constant(4)), pg: { text : 'SELECT "post"."id", $1 FROM "post"', @@ -258,7 +258,7 @@ Harness.test({ params: [4] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(4).as('col1')), pg: { text : 'SELECT $1 AS "col1" FROM "post"', @@ -283,7 +283,7 @@ Harness.test({ params: [4] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(4).plus(5)), pg: { text : 'SELECT ($1 + $2) FROM "post"', @@ -308,7 +308,7 @@ Harness.test({ params: [4,5] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(4).plus(5).as('col1')), pg: { text : 'SELECT ($1 + $2) AS "col1" FROM "post"', @@ -333,7 +333,7 @@ Harness.test({ params: [4,5] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(4),Sql.constant("abc"),Sql.constant(true)), pg: { text : 'SELECT $1, $2, $3 FROM "post"', @@ -358,7 +358,7 @@ Harness.test({ params: [4,'abc',true] }); -Harness.test({ +Harness.it({ query: post.select(Sql.constant(1).sum()), pg: { text : 'SELECT SUM($1) AS "constant_sum" FROM "post"', @@ -383,7 +383,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: Sql.select(post.select(post.id).as("column1")), pg: { text : 'SELECT (SELECT "post"."id" FROM "post") AS "column1"', @@ -408,7 +408,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(post.select(post.count()).as("column1")), pg: { text : 'SELECT (SELECT COUNT("post".*) AS "post_count" FROM "post") AS "column1"', @@ -433,7 +433,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: Sql.select(post.select(post.id).as("column1"),user.select(user.id).as("column2")), pg: { text : 'SELECT (SELECT "post"."id" FROM "post") AS "column1", (SELECT "user"."id" FROM "user") AS "column2"', diff --git a/test/dialects/shortcut-tests.js b/test/dialects/shortcut-tests.js index 35c9a90b..88c3c826 100644 --- a/test/dialects/shortcut-tests.js +++ b/test/dialects/shortcut-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); // shortcut: 'select * from ' -Harness.test({ +Harness.it({ query: user, pg: { text : 'SELECT "user".* FROM "user"', @@ -30,7 +30,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.where(user.name.equals(3)), pg: { text : 'SELECT * FROM "user" WHERE ("user"."name" = $1)', @@ -55,7 +55,7 @@ Harness.test({ params: [3] }); -Harness.test({ +Harness.it({ query: user.where(user.name.equals(3)).where(user.id.equals(1)), pg: { text : 'SELECT * FROM "user" WHERE (("user"."name" = $1) AND ("user"."id" = $2))', @@ -81,7 +81,7 @@ Harness.test({ }); // shortcut: no 'from' -Harness.test({ +Harness.it({ query: post.select(post.content), pg: { text : 'SELECT "post"."content" FROM "post"', @@ -106,7 +106,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.content).where(post.userId.equals(1)), pg: { text : 'SELECT "post"."content" FROM "post" WHERE ("post"."userId" = $1)', @@ -131,7 +131,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: post.where(post.content.isNull()).or({ content: '' }).and({ diff --git a/test/dialects/subfield-tests.js b/test/dialects/subfield-tests.js index aeaab51d..a83f1f0e 100644 --- a/test/dialects/subfield-tests.js +++ b/test/dialects/subfield-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerCompositeTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.test({ +Harness.it({ query: customer.select(customer.info.subfields.age), pg: { text : 'SELECT ("customer"."info")."age" FROM "customer"', @@ -14,7 +14,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: customer.select(customer.info.subfields.age.as('years')), pg: { text : 'SELECT ("customer"."info")."age" AS "years" FROM "customer"', @@ -23,7 +23,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.select(customer.id).where(customer.info.subfields.salary.equals(10)), pg: { text : 'SELECT "customer"."id" FROM "customer" WHERE (("customer"."info")."salary" = $1)', @@ -32,7 +32,7 @@ Harness.test({ params: [10] }); -Harness.test({ +Harness.it({ query: customer.select(customer.info.subfields.name.distinct()), pg: { text : 'SELECT DISTINCT(("customer"."info")."name") FROM "customer"', diff --git a/test/dialects/subquery-tests.js b/test/dialects/subquery-tests.js index 05d76f1f..580df437 100644 --- a/test/dialects/subquery-tests.js +++ b/test/dialects/subquery-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var Sql = require('../../lib'); -Harness.test({ +Harness.it({ query: user.select(user.name).where(user.id.in(post.select(post.userId))), pg: { text: 'SELECT "user"."name" FROM "user" WHERE ("user"."id" IN (SELECT "post"."userId" FROM "post"))', @@ -31,7 +31,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.name.in( customer.subQuery().select(customer.name).where( user.name.in( @@ -60,7 +60,7 @@ Harness.test({ params: ['%HELLO%'] }); -Harness.test({ +Harness.it({ query: Sql.select('*').from(user.subQuery()), pg: { text : 'SELECT * FROM (SELECT * FROM "user")', @@ -86,7 +86,7 @@ Harness.test({ }); // Subquery with a date -Harness.test({ +Harness.it({ query: Sql.select('*').from(post.subQuery().where(post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')))), pg: { text : 'SELECT * FROM (SELECT * FROM "post" WHERE ("post"."content" = $1))', @@ -115,7 +115,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: Sql.select('*').from(customer.subQuery('T1')).from(user.subQuery('T2')), pg: { text : 'SELECT * FROM (SELECT * FROM "customer") "T1" , (SELECT * FROM "user") "T2"', @@ -140,7 +140,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: customer.name.between( customer.subQuery().select(Sql.functions.MIN(customer.name)), customer.subQuery().select(Sql.functions.MAX(customer.name)) @@ -168,7 +168,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.subQuery().where(user.name.equals(customer.name)).exists(), pg: { text : '(EXISTS (SELECT * FROM "user" WHERE ("user"."name" = "customer"."name")))', @@ -194,7 +194,7 @@ Harness.test({ }); var limitUsers = user.subQuery('limit-users').select(user.id, user.name).from(user).order(user.name).limit(10).offset(10); -Harness.test({ +Harness.it({ query: Sql.select(limitUsers.name, post.tags).from(limitUsers.leftJoin(post).on(post.userId.equals(limitUsers.id))), pg: { text : 'SELECT "limit-users"."name", "post"."tags" FROM (SELECT "user"."id", "user"."name" FROM "user" ORDER BY "user"."name" LIMIT 10 OFFSET 10) "limit-users" LEFT JOIN "post" ON ("post"."userId" = "limit-users"."id")', @@ -220,7 +220,7 @@ Harness.test({ }); // Top-level subQuery -Harness.test({ +Harness.it({ query: Sql.subQuery().select(user.id).from(user), pg: { text : '(SELECT "user"."id" FROM "user")', @@ -246,7 +246,7 @@ Harness.test({ }); // Top-level subQuery with alias -Harness.test({ +Harness.it({ query: Sql.subQuery("x").select(user.id).from(user), pg: { text : '(SELECT "user"."id" FROM "user") "x"', diff --git a/test/dialects/support.js b/test/dialects/support.js index 4a9fa427..79633356 100644 --- a/test/dialects/support.js +++ b/test/dialects/support.js @@ -13,7 +13,7 @@ var dialects = { }; module.exports = { - test: function(expected) { + it: function(expected) { // for each dialect Object.keys(dialects).forEach(function(dialect) { var expectedObject = expected[dialect]; @@ -22,7 +22,7 @@ module.exports = { var DialectClass = dialects[dialect]; var title = dialect + ': ' + (expected.title || expectedObject.text || expectedObject); - test(title, function() { + it(title, function() { // check if this query is expected to throw if (expectedObject.throws) { diff --git a/test/dialects/table-tests.js b/test/dialects/table-tests.js index 6740a7c8..cb1b80e7 100644 --- a/test/dialects/table-tests.js +++ b/test/dialects/table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user), pg: { text : 'SELECT "user"."id" FROM "user"', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id, user.name).from(user), pg: { text : 'SELECT "user"."id", "user"."name" FROM "user"', @@ -53,7 +53,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star()).from(user), pg: { text : 'SELECT "user".* FROM "user"', @@ -78,7 +78,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id, [ user.name ]).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -99,7 +99,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select([ user.id ], user.name).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -120,7 +120,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select([ user.id , user.name ]).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -141,7 +141,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star(), user.star({ prefix: 'foo_' }), user.star({ prefix: 'bar_' })).from(user), pg: { text: 'SELECT "user".*, "user"."id" AS "foo_id", "user"."name" AS "foo_name", "user"."id" AS "bar_id", "user"."name" AS "bar_name" FROM "user"', @@ -162,7 +162,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.equals('foo')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ("user"."name" = $1)', @@ -187,7 +187,7 @@ Harness.test({ params: ['foo'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.equals('foo').or(user.name.equals('bar'))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) OR ("user"."name" = $2))', @@ -212,7 +212,7 @@ Harness.test({ params: ['foo', 'bar'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.equals('foo').and(user.name.equals('bar'))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) AND ("user"."name" = $2))', @@ -237,7 +237,7 @@ Harness.test({ params: ['foo', 'bar'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.equals('foo')).or(user.name.equals('bar')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) OR ("user"."name" = $2))', @@ -262,7 +262,7 @@ Harness.test({ params: ['foo', 'bar'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.equals('foo')).or(user.name.equals('baz')).and(user.name.equals('bar')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ((("user"."name" = $1) OR ("user"."name" = $2)) AND ("user"."name" = $3))', @@ -287,7 +287,7 @@ Harness.test({ params: ['foo', 'baz', 'bar'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.in(['foo', 'bar'])), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ("user"."name" IN ($1, $2))', @@ -312,7 +312,7 @@ Harness.test({ params: ['foo', 'bar'] }); -Harness.test({ +Harness.it({ query: user.select(user.id).from(user).where(user.name.in(['foo', 'bar']).and(user.id.equals(1))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" IN ($1, $2)) AND ("user"."id" = $3))', @@ -337,7 +337,7 @@ Harness.test({ params: ['foo', 'bar', 1] }); -Harness.test({ +Harness.it({ query: user.select(user.columns), pg: { text : 'SELECT "user"."id", "user"."name" FROM "user"', @@ -363,7 +363,7 @@ Harness.test({ }); -Harness.test({ +Harness.it({ query: user .select(user.id) .from(user) @@ -394,7 +394,7 @@ Harness.test({ params: ['boom', 1, 'bang', 2] }); -Harness.test({ +Harness.it({ query: user.select(user.name.as('user name'), user.id.as('user id')).from(user), pg: { text : 'SELECT "user"."name" AS "user name", "user"."id" AS "user id" FROM "user"', @@ -419,7 +419,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.name.as('user name')).from(user).where(user.name.equals('brian')), pg: { text : 'SELECT "user"."name" AS "user name" FROM "user" WHERE ("user"."name" = $1)', @@ -444,7 +444,7 @@ Harness.test({ params: ['brian'] }); -Harness.test({ +Harness.it({ query: user.select(user.name).from(user).where(user.name.equals('brian')), pg: { text : 'SELECT "user"."name" FROM "user" WHERE ("user"."name" = $1)', @@ -469,7 +469,7 @@ Harness.test({ params: ['brian'] }); -Harness.test({ +Harness.it({ query: user.select('name').from('user').where('name <> NULL'), pg: { text : 'SELECT name FROM user WHERE (name <> NULL)', @@ -494,7 +494,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select('name,id').from('user').where('name <> NULL'), pg: { text : 'SELECT name,id FROM user WHERE (name <> NULL)', @@ -519,7 +519,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select('name', 'id').from('user').where('name <> NULL'), pg: { text : 'SELECT name, id FROM user WHERE (name <> NULL)', @@ -544,7 +544,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select('name', 'id').from('user').where('name <> NULL').and('id <> NULL'), pg: { text : 'SELECT name, id FROM user WHERE ((name <> NULL) AND (id <> NULL))', @@ -569,7 +569,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select('name').from('user').where({ name: 'brian' }), @@ -596,7 +596,7 @@ Harness.test({ params: ['brian'] }); -Harness.test({ +Harness.it({ query: user.select('name').from('user').where({ name: 'brian', id: 1 @@ -624,7 +624,7 @@ Harness.test({ params: ['brian', 1] }); -Harness.test({ +Harness.it({ query: user.select(user.name.as('quote"quote"tick`tick`')), pg: { text : 'SELECT "user"."name" AS "quote""quote""tick`tick`" FROM "user"', @@ -649,7 +649,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select(user.star()).where(user.id.in(user.subQuery().select(user.id))), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" IN (SELECT "user"."id" FROM "user"))', diff --git a/test/dialects/ternary-clause-tests.js b/test/dialects/ternary-clause-tests.js index 04832fbc..b41873f6 100644 --- a/test/dialects/ternary-clause-tests.js +++ b/test/dialects/ternary-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: customer.select().where(customer.age.between(18, 25)), pg: { text : 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" BETWEEN $1 AND $2)', @@ -29,7 +29,7 @@ Harness.test({ params: [18, 25] }); -Harness.test({ +Harness.it({ query: post.select().where(post.userId.between(customer.subQuery().select(customer.id.min()), customer.subQuery().select(customer.id.max()))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."userId" BETWEEN (SELECT MIN("customer"."id") AS "id_min" FROM "customer") AND (SELECT MAX("customer"."id") AS "id_max" FROM "customer"))', diff --git a/test/dialects/tostring-tests.js b/test/dialects/tostring-tests.js index 53d413e8..6f0363e2 100644 --- a/test/dialects/tostring-tests.js +++ b/test/dialects/tostring-tests.js @@ -5,7 +5,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); // Null -Harness.test({ +Harness.it({ query: post.content.equals(null), pg: { text : '("post"."content" = $1)', @@ -31,7 +31,7 @@ Harness.test({ }); // Number -Harness.test({ +Harness.it({ query: post.content.equals(3.14), pg: { text : '("post"."content" = $1)', @@ -57,7 +57,7 @@ Harness.test({ }); // String -Harness.test({ +Harness.it({ query: post.content.equals('hello\''), pg: { text : '("post"."content" = $1)', @@ -83,7 +83,7 @@ Harness.test({ }); // Array -Harness.test({ +Harness.it({ query: post.content.equals([1, '2', null]), pg: { text : '("post"."content" = ($1, $2, $3))', @@ -109,7 +109,7 @@ Harness.test({ }); // Date -Harness.test({ +Harness.it({ query: post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')), pg: { text : '("post"."content" = $1)', @@ -135,7 +135,7 @@ Harness.test({ }); // Date to milliseconds -Harness.test({ +Harness.it({ query: post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')), pg: { text : '("post"."content" = $1)', @@ -170,7 +170,7 @@ var customObject = { } }; -Harness.test({ +Harness.it({ query: post.content.equals(customObject), pg: { text : '("post"."content" = $1)', diff --git a/test/dialects/truncate-table-tests.js b/test/dialects/truncate-table-tests.js index cfdb04da..e18b1869 100644 --- a/test/dialects/truncate-table-tests.js +++ b/test/dialects/truncate-table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: post.truncate(), pg: { text : 'TRUNCATE TABLE "post"', diff --git a/test/dialects/unary-clause-tests.js b/test/dialects/unary-clause-tests.js index 875de382..8e4723c7 100644 --- a/test/dialects/unary-clause-tests.js +++ b/test/dialects/unary-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var post = Harness.definePostTable(); -Harness.test({ +Harness.it({ query: customer.select().where(customer.age.isNotNull()), pg: { text : 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" IS NOT NULL)', @@ -29,7 +29,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select().where(post.userId. in (customer.subQuery().select(customer.id).where(customer.age.isNull()))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."userId" IN (SELECT "customer"."id" FROM "customer" WHERE ("customer"."age" IS NULL)))', diff --git a/test/dialects/update-tests.js b/test/dialects/update-tests.js index eb3d0b3e..a07e0cf7 100644 --- a/test/dialects/update-tests.js +++ b/test/dialects/update-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var user = Harness.defineUserTable(); var variable = Harness.defineVariableTable(); -Harness.test({ +Harness.it({ query: post.update({ content: 'test' }), @@ -32,7 +32,7 @@ Harness.test({ params: ['test'] }); -Harness.test({ +Harness.it({ query: post.update({ content: 'test', userId: 3 @@ -60,7 +60,7 @@ Harness.test({ params: ['test', 3] }); -Harness.test({ +Harness.it({ query: post.update({ content: null, userId: 3 @@ -88,7 +88,7 @@ Harness.test({ params: [null, 3] }); -Harness.test({ +Harness.it({ query: post.update({ content: 'test', userId: 3 @@ -116,7 +116,7 @@ Harness.test({ params: ['test', 3, 'no'] }); -Harness.test({ +Harness.it({ query: post.update({ content: user.name }).from(user).where(post.userId.equals(user.id)), @@ -144,7 +144,7 @@ Harness.test({ }); // update() needs to prefix ambiguous source columns; prefixing target columns is not allowed -Harness.test({ +Harness.it({ query: post.update({ userId: user.id }).from(user).where(post.userId.equals(user.id)), @@ -172,7 +172,7 @@ Harness.test({ }); // Binary updates -Harness.test({ +Harness.it({ query: post.update({ content: new Buffer('test') }), @@ -196,7 +196,7 @@ Harness.test({ }); // Boolean updates -Harness.test({ +Harness.it({ query: variable.update({ a: true, b: false @@ -221,7 +221,7 @@ Harness.test({ }); // Object updates -Harness.test({ +Harness.it({ query: variable.update({ a: {"id": 1, "value": 2}, b: [{"id": 2, "value": 3}, {"id": 3, "value": 4}] diff --git a/test/dialects/value-expression-tests.js b/test/dialects/value-expression-tests.js index d5c7fcd4..849712bf 100644 --- a/test/dialects/value-expression-tests.js +++ b/test/dialects/value-expression-tests.js @@ -6,7 +6,7 @@ var post = Harness.definePostTable(); var v = Harness.defineVariableTable(); // Test composition of binary methods +, *, -, =. -Harness.test({ +Harness.it({ query: customer.select(customer.name, customer.income.modulo(100)).where(customer.age.plus(5).multiply(customer.age.minus(2)).equals(10)), pg: { text : 'SELECT "customer"."name", ("customer"."income" % $1) FROM "customer" WHERE ((("customer"."age" + $2) * ("customer"."age" - $3)) = $4)', @@ -32,7 +32,7 @@ Harness.test({ }); // Test composition of binary (e.g. +) and unary (e.g. like) methods. -Harness.test({ +Harness.it({ query: customer.select(customer.name).where(customer.name.like(customer.id.plus('hello'))), pg: { text : 'SELECT "customer"."name" FROM "customer" WHERE ("customer"."name" LIKE ("customer"."id" + $1))', @@ -59,7 +59,7 @@ Harness.test({ // Test implementing simple formulas. // Acceleration formula. (a * t^2 / 2) + (v * t) = d -Harness.test({ +Harness.it({ query: v.select(v.a.multiply(v.a).divide(2).plus(v.v.multiply(v.t)).equals(v.d)), pg: { text : 'SELECT (((("variable"."a" * "variable"."a") / $1) + ("variable"."v" * "variable"."t")) = "variable"."d") FROM "variable"', @@ -85,7 +85,7 @@ Harness.test({ }); // Pythagorean theorem. a^2 + b^2 = c^2. -Harness.test({ +Harness.it({ query: v.select(v.a.multiply(v.a).plus(v.b.multiply(v.b)).equals(v.c.multiply(v.c))), pg: { text : 'SELECT ((("variable"."a" * "variable"."a") + ("variable"."b" * "variable"."b")) = ("variable"."c" * "variable"."c")) FROM "variable"', @@ -110,7 +110,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: post.select(post.id).where(post.content.equals(new Buffer('test'))), pg: { text : 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = $1)', @@ -132,7 +132,7 @@ Harness.test({ }); // concat tests -Harness.test({ +Harness.it({ query: post.select(post.content.concat(post.tags)), pg: { text : 'SELECT ("post"."content" || "post"."tags") FROM "post"', diff --git a/test/dialects/where-clause-tests.js b/test/dialects/where-clause-tests.js index 3282b7d9..02be8696 100644 --- a/test/dialects/where-clause-tests.js +++ b/test/dialects/where-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.test({ +Harness.it({ query: user.where(user.id.isNotNull(), user.name.isNotNull()), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -28,7 +28,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.and(user.id.isNotNull(), user.name.isNotNull()), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -53,7 +53,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.where([user.id.isNotNull(), user.name.isNotNull()]), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -78,7 +78,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.where([]), pg: { text : 'SELECT * FROM "user" WHERE (1 = 1)', @@ -103,7 +103,7 @@ Harness.test({ params: [] }); -Harness.test({ +Harness.it({ query: user.select().where(user.id.equals(1)).and(user.name.equals('a')), pg: { text : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) AND ("user"."name" = $2))', @@ -128,7 +128,7 @@ Harness.test({ params: [1,'a'] }); -Harness.test({ +Harness.it({ query: user.select().and(user.id.equals(1)), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)', @@ -153,7 +153,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: user.select().or(user.id.equals(1)), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)', @@ -178,7 +178,7 @@ Harness.test({ params: [1] }); -Harness.test({ +Harness.it({ query: user.select().and(user.id.equals(1)).or(user.name.equals('a')), pg: { text : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) OR ("user"."name" = $2))', diff --git a/test/function-tests.js b/test/function-tests.js index 6c53072d..8edde5b2 100644 --- a/test/function-tests.js +++ b/test/function-tests.js @@ -13,15 +13,15 @@ var user = sql.define({ ] }); -suite('function', function() { - test('alias function call', function() { +describe('function', function() { + it('alias function call', function() { var upper = sql.functions.UPPER; var aliasedUpper = upper(user.email).as('upperAlias').toQuery(); assert.equal(aliasedUpper.text, 'UPPER("user"."email") AS "upperAlias"'); }); - test('function call on aliased column', function() { + it('function call on aliased column', function() { var round = sql.functions.ROUND; var aliasedRound = round(user.howOld, 2).toQuery(); @@ -29,7 +29,7 @@ suite('function', function() { assert.equal(aliasedRound.values[0], 2); }); - test('creating function call works', function() { + it('creating function call works', function() { var upper = sql.functionCallCreator('UPPER'); var functionCall = upper('hello', 'world').toQuery(); @@ -38,7 +38,7 @@ suite('function', function() { assert.equal(functionCall.values[1], 'world'); }); - test('creating function call on columns works', function() { + it('creating function call on columns works', function() { var upper = sql.functionCallCreator('UPPER'); var functionCall = upper(user.id, user.email).toQuery(); @@ -46,7 +46,7 @@ suite('function', function() { assert.equal(functionCall.values.length, 0); }); - test('function call inside select works', function() { + it('function call inside select works', function() { var upper = sql.functionCallCreator('UPPER'); var query = sql.select(upper(user.id, user.email)).from(user).where(user.email.equals('brian.m.carlson@gmail.com')).toQuery(); @@ -54,7 +54,7 @@ suite('function', function() { assert.equal(query.values[0], 'brian.m.carlson@gmail.com'); }); - test('standard aggregate functions with having clause', function() { + it('standard aggregate functions with having clause', function() { var count = sql.functions.COUNT; var distinct = sql.functions.DISTINCT; var distinctEmailCount = count(distinct(user.email)); @@ -65,7 +65,7 @@ suite('function', function() { assert.equal(query.values[0], 100); }); - test('custom and standard functions behave the same', function() { + it('custom and standard functions behave the same', function() { var standardUpper = sql.functions.UPPER; var customUpper = sql.functionCallCreator('UPPER'); @@ -77,7 +77,7 @@ suite('function', function() { assert.equal(customQuery.text, expectedQuery); }); - test('combine function with operations', function() { + it('combine function with operations', function() { var f = sql.functions; var query = user.select(f.AVG(f.DISTINCT(f.COUNT(user.id).plus(f.MAX(user.id))).minus(f.MIN(user.id))).multiply(100)).toQuery(); @@ -85,7 +85,7 @@ suite('function', function() { assert.equal(query.values[0], 100); }); - test('use custom function', function() { + it('use custom function', function() { var query = user.select(sql.function('PHRASE_TO_TSQUERY')('simple', user.name)).toQuery(); assert.equal(query.text, 'SELECT PHRASE_TO_TSQUERY($1, "user"."name") FROM "user"'); assert.equal(query.values[0], 'simple'); diff --git a/test/index-tests.js b/test/index-tests.js index f25839e1..082a8b31 100644 --- a/test/index-tests.js +++ b/test/index-tests.js @@ -8,55 +8,55 @@ var user = sql.define({ columns: ['id', 'email'] }); -suite('index', function() { - test('unknown dialect throws exception', function() { +describe('index', function() { + it('unknown dialect throws exception', function() { assert.throws(function() { sql.setDialect('asdf'); }); }); - test('stores the default dialect\'s name if none has been passed', function() { + it('stores the default dialect\'s name if none has been passed', function() { assert.equal(sql.create().dialectName, 'postgres'); }); - test('stores the sqlite dialect', function() { + it('stores the sqlite dialect', function() { assert.equal(sql.create('sqlite').dialectName, 'sqlite'); }); - test('stores the mysql dialect', function() { + it('stores the mysql dialect', function() { assert.equal(sql.create('mysql').dialectName, 'mysql'); }); - test('stores the mssql dialect', function() { + it('stores the mssql dialect', function() { assert.equal(sql.create('mssql').dialectName, 'mssql'); }); - test('stores the oracle dialect', function() { + it('stores the oracle dialect', function() { assert.equal(sql.create('oracle').dialectName, 'oracle'); }); - test('can create a query using the default dialect', function() { + it('can create a query using the default dialect', function() { var query = sql.select(user.id).from(user).where(user.email.equals('brian.m.carlson@gmail.com')).toQuery(); assert.equal(query.text, 'SELECT "user"."id" FROM "user" WHERE ("user"."email" = $1)'); assert.equal(query.values[0], 'brian.m.carlson@gmail.com'); }); - test('setting dialect to postgres works', function() { + it('setting dialect to postgres works', function() { sql.setDialect('postgres'); var query = sql.select(user.id).from(user).where(user.email.equals('brian.m.carlson@gmail.com')).toQuery(); assert.equal(query.text, 'SELECT "user"."id" FROM "user" WHERE ("user"."email" = $1)'); assert.equal(query.values[0], 'brian.m.carlson@gmail.com'); }); - test('sql.create creates an instance with a new dialect', function() { + it('sql.create creates an instance with a new dialect', function() { var mysql = sql.create('mysql'); var query = mysql.select(user.id).from(user).where(user.email.equals('brian.m.carlson@gmail.com')).toQuery(); assert.equal(query.text, 'SELECT `user`.`id` FROM `user` WHERE (`user`.`email` = ?)'); assert.equal(query.values[0], 'brian.m.carlson@gmail.com'); }); - test('sql.define for parallel dialects work independently', function() { + it('sql.define for parallel dialects work independently', function() { var mssql = sql.create('mssql'); var mysql = sql.create('mysql'); var postgres = sql.create('postgres'); @@ -76,7 +76,7 @@ suite('index', function() { assert.equal(oracleTable.sql, oracle); }); - test('using Sql as a class', function() { + it('using Sql as a class', function() { var Sql = sql.Sql; var mssql = new Sql('mssql'); var mysql = new Sql('mysql'); @@ -91,7 +91,7 @@ suite('index', function() { assert.equal(oracle.dialect, require(__dirname + '/../lib/dialect/oracle')); }); - test('override dialect for toQuery using dialect name', function() { + it('override dialect for toQuery using dialect name', function() { var Sql = sql.Sql; var mssql = new Sql('mssql'); var mysql = new Sql('mysql'); @@ -122,35 +122,35 @@ suite('index', function() { assert.deepEqual(oracleQuery.values, values); }); - test('override dialect for toQuery using invalid dialect name', function() { + it('override dialect for toQuery using invalid dialect name', function() { var query = sql.select(user.id).from(user); assert.throws(function() { query.toQuery('invalid'); }); }); - test('using named queries with toNamedQuery', function() { + it('using named queries with toNamedQuery', function() { var query = sql.select(user.id).from(user).where(user.email.equals('brian.m.carlson@gmail.com')).toNamedQuery('users'); assert.equal(query.text, 'SELECT "user"."id" FROM "user" WHERE ("user"."email" = $1)'); assert.equal(query.values[0], 'brian.m.carlson@gmail.com'); assert.equal(query.name, 'users'); }); - test('provide an empty query name for toNamedQuery', function() { + it('provide an empty query name for toNamedQuery', function() { var query = sql.select(user.id).from(user); assert.throws(function() { query.toNamedQuery(''); }); }); - test('provide an undefined query name for toNamedQuery', function() { + it('provide an undefined query name for toNamedQuery', function() { var query = sql.select(user.id).from(user); assert.throws(function() { query.toNamedQuery(); }); }); - test('override dialect for toNamedQuery using dialect name', function() { + it('override dialect for toNamedQuery using dialect name', function() { var Sql = sql.Sql; var mysql = new Sql('mysql'); var postgres = new Sql('postgres'); @@ -188,14 +188,14 @@ suite('index', function() { }); - test('override dialect for toNamedQuery using invalid dialect name', function() { + it('override dialect for toNamedQuery using invalid dialect name', function() { var query = sql.select(user.id).from(user); assert.throws(function() { query.toNamedQuery('name', 'invalid'); }); }); - test('mssql default parameter place holder is @index', function() { + it('mssql default parameter place holder is @index', function() { var Sql = sql.Sql; var mssql = new Sql('mssql'); var query = mssql.select(user.id).from(user).where(user.email.equals('x@y.com')).toQuery(); @@ -203,7 +203,7 @@ suite('index', function() { assert.equal(query.values[0], 'x@y.com'); }); - test('mssql override default parameter placeholder with ?', function() { + it('mssql override default parameter placeholder with ?', function() { var Sql = sql.Sql; var mssql = new Sql('mssql',{questionMarkParameterPlaceholder:true}); var query = mssql.select(user.id).from(user).where(user.email.equals('x@y.com')).toQuery(); diff --git a/test/select-tests.js b/test/select-tests.js index a0befc4c..2accd70f 100644 --- a/test/select-tests.js +++ b/test/select-tests.js @@ -5,11 +5,11 @@ var Select = require(__dirname + '/../lib/node/select'); var select = new Select({sql: require('../lib/index')}); -test('has SELECT type', function() { +it('has SELECT type', function() { assert.equal(select.type, 'SELECT'); }); -test('can go toQuery', function() { +it('can go toQuery', function() { assert.equal(select.toQuery().text, 'SELECT '); }); diff --git a/test/table-tests.js b/test/table-tests.js index 73d43367..bef7c340 100644 --- a/test/table-tests.js +++ b/test/table-tests.js @@ -5,20 +5,20 @@ var Table = require(__dirname + '/../lib/table'); var Column = require(__dirname + '/../lib/column'); var Sql = require('../'); -suite('table', function() { +describe('table', function() { var table = new Table({ name: 'bang' }); - test('has name', function() { + it('has name', function() { assert.equal(table.getName(), 'bang'); }); - test('has no columns', function() { + it('has no columns', function() { assert.equal(table.columns.length, 0); }); - test('can add column', function() { + it('can add column', function() { var col = new Column({ table: table, name: 'boom' @@ -32,17 +32,17 @@ suite('table', function() { assert.equal(table.boom, col); }); - test('creates query node', function() { + it('creates query node', function() { var sel = table.select(table.boom); assert.equal(sel.type, 'QUERY'); }); - test('creates *-query if no args is provided to select()', function() { + it('creates *-query if no args is provided to select()', function() { var sel = table.select(); assert.ok(sel.nodes[0].nodes[0].star); }); - test('can be defined', function() { + it('can be defined', function() { var user = Table.define({ name: 'user', columns: ['id', 'name'] @@ -57,7 +57,7 @@ suite('table', function() { }); }); -test('table with user-defined column property names', function () { +it('table with user-defined column property names', function () { var table = Table.define({ name: 'blah', columns: [{ @@ -78,7 +78,7 @@ test('table with user-defined column property names', function () { assert(table.email === undefined, 'Expected table.email to not exist'); }); -test('table with fancier column definitions', function() { +it('table with fancier column definitions', function() { var table = Table.define({ name: 'blah', columns: [{ @@ -109,7 +109,7 @@ test('table with fancier column definitions', function() { assert.equal(email.anythingYouWant, 'awesome'); }); -test('table with object structured column definitions', function() { +it('table with object structured column definitions', function() { var table = Table.define({ name: 'blah', columns: { @@ -141,7 +141,7 @@ test('table with object structured column definitions', function() { assert.equal(email.anythingYouWant, 'awesome'); }); -test('table with dynamic column definition', function() { +it('table with dynamic column definition', function() { var table = Table.define({ name: 'foo', columns: [] }); assert.equal(table.columns.length, 0); @@ -159,7 +159,7 @@ test('table with dynamic column definition', function() { assert.equal(table.columns.length, 1); }); -test('hasColumn', function() { +it('hasColumn', function() { var table = Table.define({ name: 'foo', columns: [] }); assert.equal(table.hasColumn('baz'), false); @@ -167,7 +167,7 @@ test('hasColumn', function() { assert.equal(table.hasColumn('baz'), true); }); -test('hasColumn with user-defined column property', function() { +it('hasColumn with user-defined column property', function() { var table = Table.define({ name: 'blah', columns: [{ @@ -180,40 +180,40 @@ test('hasColumn with user-defined column property', function() { assert.equal(table.hasColumn('theId'), true); }); -test('the column "from" does not overwrite the from method', function() { +it('the column "from" does not overwrite the from method', function() { var table = Table.define({ name: 'foo', columns: [] }); table.addColumn('from'); assert.equal(typeof table.from, 'function'); }); -test('getColumn returns the from column', function() { +it('getColumn returns the from column', function() { var table = Table.define({ name: 'foo', columns: [] }); table.addColumn('from'); assert(table.getColumn('from') instanceof Column); assert(table.get('from') instanceof Column); }); -test('set and get schema', function () { +it('set and get schema', function () { var table = Table.define({ name: 'foo', schema: 'bar', columns: [] }); assert.equal(table.getSchema(), 'bar'); table.setSchema('barbarz'); assert.equal(table.getSchema(), 'barbarz'); }); -suite('table.clone', function() { - test('check if it is a copy, not just a reference', function() { +describe('table.clone', function() { + it('check if it is a copy, not just a reference', function() { var table = Table.define({ name: 'foo', columns: [] }); var copy = table.clone(); assert.notEqual(table, copy); }); - test('copy columns', function() { + it('copy columns', function() { var table = Table.define({ name: 'foo', columns: ['bar'] }); var copy = table.clone(); assert(copy.get('bar') instanceof Column); }); - test('overwrite config while copying', function() { + it('overwrite config while copying', function() { var table = Table.define({ name: 'foo', schema: 'foobar', @@ -234,7 +234,7 @@ suite('table.clone', function() { }); }); -test('dialects', function () { +it('dialects', function () { var sql = new Sql.Sql('mysql'); var foo = sql.define({ name: 'foo', columns: [ 'id' ] }), bar = sql.define({ name: 'bar', columns: [ 'id' ] }); @@ -249,7 +249,7 @@ test('dialects', function () { assert.equal(actual, '"foo" INNER JOIN "bar" ON ("bar"."id" = 1)'); }); -test('limit', function () { +it('limit', function () { var user = Table.define({name: 'user', columns: ['id', 'name']}); var query = user.limit(3); assert.equal(query.nodes.length, 1); @@ -257,7 +257,7 @@ test('limit', function () { assert.equal(query.nodes[0].count, 3); }); -test('offset', function () { +it('offset', function () { var user = Table.define({name: 'user', columns: ['id', 'name']}); var query = user.offset(20); assert.equal(query.nodes.length, 1); @@ -265,7 +265,7 @@ test('offset', function () { assert.equal(query.nodes[0].count, 20); }); -test('order', function () { +it('order', function () { var user = Table.define({name: 'user', columns: ['id', 'name']}); var query = user.order(user.name); assert.equal(query.nodes.length, 1); diff --git a/test/ternary-clause-tests.js b/test/ternary-clause-tests.js index 1e7c975f..416d6ee7 100644 --- a/test/ternary-clause-tests.js +++ b/test/ternary-clause-tests.js @@ -8,7 +8,7 @@ var Foo = Table.define({ columns: ['baz','bar'] }); -test('operators', function() { +it('operators', function() { assert.equal(Foo.bar.between(1, 2).operator, 'BETWEEN'); assert.equal(Foo.baz.between(1, 2).separator, 'AND'); }); diff --git a/test/unary-clause-tests.js b/test/unary-clause-tests.js index f5b36a1b..d5597ebd 100644 --- a/test/unary-clause-tests.js +++ b/test/unary-clause-tests.js @@ -8,7 +8,7 @@ var Foo = Table.define({ columns: ['baz','bar'] }); -test('operators', function() { +it('operators', function() { assert.equal(Foo.bar.isNull().operator, 'IS NULL'); assert.equal(Foo.baz.isNotNull().operator, 'IS NOT NULL'); }); diff --git a/test/value-expression-tests.js b/test/value-expression-tests.js index ec80415a..9b195951 100644 --- a/test/value-expression-tests.js +++ b/test/value-expression-tests.js @@ -4,8 +4,8 @@ var assert = require('assert'); var valueExpressionMixin = require(__dirname + './../lib/node/valueExpression'); var Node = require(__dirname + './../lib/node'); -suite('value-expression', function() { - test("value expression mixin should not overwrite Node prototype properties", function() { +describe('value-expression', function() { + it("value expression mixin should not overwrite Node prototype properties", function() { var mixin = valueExpressionMixin(); // make sure that the node class doesn't have any conflicting properties From 0a218c56b718cd0339121cd7cd4923c4f83c9ca0 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Thu, 9 Jun 2022 17:05:31 -0600 Subject: [PATCH 2/8] Updated node to 16, 18 in travis.yml --- .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07becfb2..08e555cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ language: node_js node_js: - - "5.0" - - "4.2" - - "0.10" - - "0.11" + - "18.3" + - "16.15" matrix: allow_failures: - - node_js: "0.10" - - node_js: "0.11" \ No newline at end of file From a53f3a268791e6d63fec5cbd52faa23f8b293ad1 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Thu, 9 Jun 2022 17:08:17 -0600 Subject: [PATCH 3/8] Update node LTS 16 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08e555cf..81f06d48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: - - "18.3" - "16.15" matrix: From 597baca3a2f97edd134c9cf2bd046bc6780bc989 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Thu, 9 Jun 2022 17:36:31 -0600 Subject: [PATCH 4/8] Undid Harness changes --- test/dialects/aggregate-tests.js | 38 +++++------ test/dialects/alias-tests.js | 10 +-- test/dialects/alter-table-tests.js | 26 ++++---- test/dialects/array-tests.js | 18 +++--- test/dialects/binary-clause-tests.js | 8 +-- test/dialects/case-tests.js | 16 ++--- test/dialects/cast-tests.js | 24 +++---- test/dialects/clause-ordering-tests.js | 8 +-- test/dialects/create-table-tests.js | 46 ++++++------- test/dialects/create-view-tests.js | 6 +- test/dialects/date-tests.js | 24 +++---- test/dialects/delete-tests.js | 14 ++-- test/dialects/distinct-on-tests.js | 4 +- test/dialects/distinct-tests.js | 10 +-- test/dialects/drop-table-tests.js | 8 +-- test/dialects/for-share-tests.js | 4 +- test/dialects/for-update-tests.js | 4 +- test/dialects/from-clause-tests.js | 8 +-- test/dialects/function-tests.js | 6 +- test/dialects/group-by-tests.js | 10 +-- test/dialects/having-tests.js | 6 +- test/dialects/hstore-tests.js | 4 +- test/dialects/ilike-tests.js | 8 +-- test/dialects/in-clause-tests.js | 14 ++-- test/dialects/indexes-tests.js | 22 +++---- test/dialects/insert-tests.js | 86 ++++++++++++------------- test/dialects/join-tests.js | 18 +++--- test/dialects/join-to-tests.js | 6 +- test/dialects/json-tests.js | 8 +-- test/dialects/limit-and-offset-tests.js | 8 +-- test/dialects/literal-tests.js | 6 +- test/dialects/matches-test.js | 6 +- test/dialects/namespace-tests.js | 10 +-- test/dialects/not-in-clause-tests.js | 14 ++-- test/dialects/order-tests.js | 28 ++++---- test/dialects/regex-tests.js | 8 +-- test/dialects/replace-tests.js | 86 ++++++++++++------------- test/dialects/returning-tests.js | 4 +- test/dialects/schema-tests.js | 12 ++-- test/dialects/select-tests.js | 36 +++++------ test/dialects/shortcut-tests.js | 12 ++-- test/dialects/subfield-tests.js | 8 +-- test/dialects/subquery-tests.js | 20 +++--- test/dialects/support.js | 2 +- test/dialects/table-tests.js | 54 ++++++++-------- test/dialects/ternary-clause-tests.js | 4 +- test/dialects/tostring-tests.js | 14 ++-- test/dialects/truncate-table-tests.js | 2 +- test/dialects/unary-clause-tests.js | 4 +- test/dialects/update-tests.js | 18 +++--- test/dialects/value-expression-tests.js | 12 ++-- test/dialects/where-clause-tests.js | 16 ++--- 52 files changed, 424 insertions(+), 424 deletions(-) diff --git a/test/dialects/aggregate-tests.js b/test/dialects/aggregate-tests.js index 069b1995..59d48d57 100644 --- a/test/dialects/aggregate-tests.js +++ b/test/dialects/aggregate-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var customerAlias = Harness.defineCustomerAliasTable(); -Harness.it({ +Harness.test({ query: post.select(post.count()), pg: { text : 'SELECT COUNT("post".*) AS "post_count" FROM "post"', @@ -30,7 +30,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.count('post_count')), pg: { text : 'SELECT COUNT("post".*) AS "post_count" FROM "post"', @@ -55,7 +55,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.count().as('post_amount')), pg: { text : 'SELECT COUNT("post".*) AS "post_amount" FROM "post"', @@ -80,7 +80,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.count()), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -105,7 +105,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.count('content_count')), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -130,7 +130,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.count().as('content_count')), pg: { text : 'SELECT COUNT("post"."content") AS "content_count" FROM "post"', @@ -155,7 +155,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.count()), pg: { text : 'SELECT COUNT("customer".*) AS "customer_count" FROM "customer"', @@ -176,7 +176,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.min()), pg: { text : 'SELECT MIN("post"."id") AS "id_min" FROM "post"', @@ -201,7 +201,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.min().as('min_id')), pg: { text : 'SELECT MIN("post"."id") AS "min_id" FROM "post"', @@ -226,7 +226,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.min('min_id')), pg: { text : 'SELECT MIN("post"."id") AS "min_id" FROM "post"', @@ -251,7 +251,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.max()), pg: { text : 'SELECT MAX("post"."id") AS "id_max" FROM "post"', @@ -276,7 +276,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.max().as('max_id')), pg: { text : 'SELECT MAX("post"."id") AS "max_id" FROM "post"', @@ -301,7 +301,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.max('max_id')), pg: { text : 'SELECT MAX("post"."id") AS "max_id" FROM "post"', @@ -326,7 +326,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.sum()), pg: { text : 'SELECT SUM("post"."id") AS "id_sum" FROM "post"', @@ -351,7 +351,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.sum().as('sum_id')), pg: { text : 'SELECT SUM("post"."id") AS "sum_id" FROM "post"', @@ -376,7 +376,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.sum('sum_id')), pg: { text : 'SELECT SUM("post"."id") AS "sum_id" FROM "post"', @@ -401,7 +401,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.avg()), pg: { text : 'SELECT AVG("post"."id") AS "id_avg" FROM "post"', @@ -426,7 +426,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.avg().as('avg_id')), pg: { text : 'SELECT AVG("post"."id") AS "avg_id" FROM "post"', @@ -451,7 +451,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.avg('avg_id')), pg: { text : 'SELECT AVG("post"."id") AS "avg_id" FROM "post"', diff --git a/test/dialects/alias-tests.js b/test/dialects/alias-tests.js index 4a9c99c8..32db9308 100644 --- a/test/dialects/alias-tests.js +++ b/test/dialects/alias-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: customer.select(customer.name.isNull().as('nameIsNull')), pg: { text : 'SELECT ("customer"."name" IS NULL) AS "nameIsNull" FROM "customer"', @@ -29,7 +29,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(customer.name.plus(customer.age).as('nameAndAge')).where(customer.age.gt(10).and(customer.age.lt(20))), pg: { text : 'SELECT ("customer"."name" + "customer"."age") AS "nameAndAge" FROM "customer" WHERE (("customer"."age" > $1) AND ("customer"."age" < $2))', @@ -54,7 +54,7 @@ Harness.it({ params: [10, 20] }); -Harness.it({ +Harness.test({ query: customer.select(customer.age.between(10, 20).as('ageBetween')), pg: { text : 'SELECT ("customer"."age" BETWEEN $1 AND $2) AS "ageBetween" FROM "customer"', @@ -79,7 +79,7 @@ Harness.it({ params: [10, 20] }); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.ROUND(customer.age.as('ageBetween'), 2)), pg: { text : 'SELECT ROUND("customer"."age", $1) FROM "customer"', @@ -104,7 +104,7 @@ Harness.it({ params: [2] }); -Harness.it({ +Harness.test({ query: customer.select(customer.age.notBetween(10, 20).as('ageNotBetween')), pg: { text : 'SELECT ("customer"."age" NOT BETWEEN $1 AND $2) AS "ageNotBetween" FROM "customer"', diff --git a/test/dialects/alter-table-tests.js b/test/dialects/alter-table-tests.js index 6f143c45..d050da3d 100644 --- a/test/dialects/alter-table-tests.js +++ b/test/dialects/alter-table-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var Table = require(__dirname + '/../../lib/table'); -Harness.it({ +Harness.test({ query: post.alter().dropColumn(post.content), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content"', @@ -29,7 +29,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.alter().dropColumn(post.content).dropColumn(post.userId), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content", DROP COLUMN "userId"', @@ -54,7 +54,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.alter().dropColumn('content').dropColumn('userId'), pg: { text : 'ALTER TABLE "post" DROP COLUMN "content", DROP COLUMN "userId"', @@ -79,7 +79,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.alter().rename('posts'), pg: { text : 'ALTER TABLE "post" RENAME TO "posts"', @@ -112,7 +112,7 @@ var group = Table.define({ ] }); -Harness.it({ +Harness.test({ query: group.alter().addColumn(group.id), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100)', @@ -137,7 +137,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.alter().addColumn(group.id).addColumn(group.userId), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100), ADD COLUMN "userId" varchar(100)', @@ -162,7 +162,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.alter().addColumn('id', 'varchar(100)').addColumn('userId', 'varchar(100)'), pg: { text : 'ALTER TABLE "group" ADD COLUMN "id" varchar(100), ADD COLUMN "userId" varchar(100)', @@ -187,7 +187,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.alter().renameColumn('userId', 'newUserId'), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "newUserId"', @@ -208,7 +208,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.alter().renameColumn(group.userId, 'newUserId'), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "newUserId"', @@ -229,7 +229,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.alter().renameColumn('userId', group.id), pg: { text : 'ALTER TABLE "group" RENAME COLUMN "userId" TO "id"', @@ -259,7 +259,7 @@ var UserWithSignature = Table.define({ ] }); -Harness.it({ +Harness.test({ query: UserWithSignature.alter().renameColumn(UserWithSignature.get('Signature'), 'sig'), pg: { text : 'ALTER TABLE "UserWithSignature" RENAME COLUMN "Signature" TO "sig"', @@ -295,7 +295,7 @@ var post = Table.define({ }] }); -Harness.it({ +Harness.test({ query: post.alter().addColumn(post.userId), pg: { text : 'ALTER TABLE "post" ADD COLUMN "userId" int REFERENCES "user"("id")', @@ -316,7 +316,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.alter().addColumn(post.picture), pg: { text : 'ALTER TABLE "post" ADD COLUMN "picture" varchar(100)', diff --git a/test/dialects/array-tests.js b/test/dialects/array-tests.js index 6c3a3ed6..f4191400 100644 --- a/test/dialects/array-tests.js +++ b/test/dialects/array-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var Sql = require('../../lib'); // Array columns -Harness.it({ +Harness.test({ query: post.update({ tags: post.tags.concat(Sql.array('nodejs')) }), @@ -16,7 +16,7 @@ Harness.it({ params: ['nodejs'] }); -Harness.it({ +Harness.test({ query: post.select( post.tags.contains(Sql.array('nodejs', 'js')) ), @@ -27,7 +27,7 @@ Harness.it({ params: ['nodejs', 'js'] }); -Harness.it({ +Harness.test({ query: post.select( post.tags.containedBy(Sql.array('nodejs', 'js')) ), @@ -38,7 +38,7 @@ Harness.it({ params: ['nodejs', 'js'] }); -Harness.it({ +Harness.test({ query: post.select( post.tags.overlap(Sql.array('nodejs', 'js')) ), @@ -49,7 +49,7 @@ Harness.it({ params: ['nodejs', 'js'] }); -Harness.it({ +Harness.test({ query: post.select(post.tags.slice(2,3)), pg: { text : 'SELECT ("post"."tags")[$1:$2] FROM "post"', @@ -58,7 +58,7 @@ Harness.it({ params: [2, 3] }); -Harness.it({ +Harness.test({ query: post.select(post.tags.at(2)), pg: { text : 'SELECT ("post"."tags")[$1] FROM "post"', @@ -68,7 +68,7 @@ Harness.it({ }); // Array literals -Harness.it({ +Harness.test({ query: post.select(Sql.array(1,2,3)), pg: { text : 'SELECT ARRAY[$1, $2, $3] FROM "post"', @@ -77,7 +77,7 @@ Harness.it({ params: [1, 2, 3] }); -Harness.it({ +Harness.test({ query: post.select(Sql.array(1,2,3).slice(2,3)), pg: { text : 'SELECT (ARRAY[$1, $2, $3])[$4:$5] FROM "post"', @@ -86,7 +86,7 @@ Harness.it({ params: [1,2,3,2,3] }); -Harness.it({ +Harness.test({ query: post.select(Sql.array(1,2,3).at(2)), pg: { text : 'SELECT (ARRAY[$1, $2, $3])[$4] FROM "post"', diff --git a/test/dialects/binary-clause-tests.js b/test/dialects/binary-clause-tests.js index e619d6b0..69c355fe 100644 --- a/test/dialects/binary-clause-tests.js +++ b/test/dialects/binary-clause-tests.js @@ -6,7 +6,7 @@ var customerAlias = Harness.defineCustomerAliasTable(); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: customer.select(customer.name.plus(customer.age)), pg: { text : 'SELECT ("customer"."name" + "customer"."age") FROM "customer"', @@ -31,7 +31,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.name_alias.plus(customerAlias.age_alias)), pg: { text : 'SELECT ("customer"."name" + "customer"."age") FROM "customer"', @@ -52,7 +52,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.plus('!')).where(post.userId. in (customer.subQuery().select(customer.id))), pg: { text : 'SELECT ("post"."content" + $1) FROM "post" WHERE ("post"."userId" IN (SELECT "customer"."id" FROM "customer"))', @@ -77,7 +77,7 @@ Harness.it({ params: ['!'] }); -Harness.it({ +Harness.test({ query: post.select(post.id.plus(': ').plus(post.content)).where(post.userId.notIn(customer.subQuery().select(customer.id))), pg: { text : 'SELECT (("post"."id" + $1) + "post"."content") FROM "post" WHERE ("post"."userId" NOT IN (SELECT "customer"."id" FROM "customer"))', diff --git a/test/dialects/case-tests.js b/test/dialects/case-tests.js index 4f643ef0..f492a4f5 100644 --- a/test/dialects/case-tests.js +++ b/test/dialects/case-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); // Check case expression with primary when expressions and else branch. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([true, false], [0, 1], 2)), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END) FROM "customer"', @@ -32,7 +32,7 @@ Harness.it({ }); // Check case expression as a subexpression. -Harness.it({ +Harness.test({ query: customer.select(customer.age.plus(customer.age.case([true, false], [0, 1], 2))), pg: { text : 'SELECT ("customer"."age" + (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END)) FROM "customer"', @@ -60,7 +60,7 @@ Harness.it({ }); // Check case expression as subexpression on the left. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([true, false], [0, 1], 2).plus(3)), pg: { text : 'SELECT ((CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE $5 END) + $6) FROM "customer"', @@ -88,7 +88,7 @@ Harness.it({ }); // Check case expression with primary when expressions and compound else expression. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([true, false], [0, 1], customer.age.between(10, 20))), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 ELSE ("customer"."age" BETWEEN $5 AND $6) END) FROM "customer"', @@ -116,7 +116,7 @@ Harness.it({ }); // Check case expression with primary when expressions without else branch. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([true, false], [0, 1])), pg: { text : 'SELECT (CASE WHEN $1 THEN $2 WHEN $3 THEN $4 END) FROM "customer"', @@ -144,7 +144,7 @@ Harness.it({ }); // Check case expression with compound when expressions and else branch. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [0, 1], 2)), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN $4 WHEN ("customer"."age" <= $5) THEN $6 ELSE $7 END) FROM "customer"', @@ -170,7 +170,7 @@ Harness.it({ }); // Check case expression without else branch. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [0, 1])), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN $4 WHEN ("customer"."age" <= $5) THEN $6 END) FROM "customer"', @@ -196,7 +196,7 @@ Harness.it({ }); // Check case expression with compound then expressions. -Harness.it({ +Harness.test({ query: customer.select(customer.age.case([customer.age.in([10, 20, 30]), customer.age.lte(60)], [customer.age.plus(5), customer.age.minus(1)])), pg: { text : 'SELECT (CASE WHEN ("customer"."age" IN ($1, $2, $3)) THEN ("customer"."age" + $4) WHEN ("customer"."age" <= $5) THEN ("customer"."age" - $6) END) FROM "customer"', diff --git a/test/dialects/cast-tests.js b/test/dialects/cast-tests.js index 7f2974a8..2295d720 100644 --- a/test/dialects/cast-tests.js +++ b/test/dialects/cast-tests.js @@ -5,7 +5,7 @@ var customer = Harness.defineCustomerTable(); var customerAlias = Harness.defineCustomerAliasTable(); // Cast columns. -Harness.it({ +Harness.test({ query: customer.select(customer.age.cast('int')), pg: { text : 'SELECT CAST("customer"."age" AS int) FROM "customer"', @@ -30,7 +30,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(customer.name.cast('varchar(10)')), pg: { text : 'SELECT CAST("customer"."name" AS varchar(10)) FROM "customer"', @@ -56,7 +56,7 @@ Harness.it({ }); // Cast binary expressions. -Harness.it({ +Harness.test({ query: customer.select(customer.name.plus(customer.age).cast('varchar(15)')), pg: { text : 'SELECT CAST(("customer"."name" + "customer"."age") AS varchar(15)) FROM "customer"', @@ -82,7 +82,7 @@ Harness.it({ }); // Cast cast expressions. -Harness.it({ +Harness.test({ query: customer.select(customer.name.cast('varchar(15)').cast('varchar(10)')), pg: { text : 'SELECT CAST(CAST("customer"."name" AS varchar(15)) AS varchar(10)) FROM "customer"', @@ -108,7 +108,7 @@ Harness.it({ }); // Cast in WHERE. -Harness.it({ +Harness.test({ query: customer.select(customer.name).where(customer.age.cast('int').plus(100).equals(150)), pg: { text : 'SELECT "customer"."name" FROM "customer" WHERE ((CAST("customer"."age" AS int) + $1) = $2)', @@ -134,7 +134,7 @@ Harness.it({ }); // Alias cast. -Harness.it({ +Harness.test({ query: customer.select(customer.age.cast('int').as('age_int')), pg: { text : 'SELECT CAST("customer"."age" AS int) AS "age_int" FROM "customer"', @@ -160,7 +160,7 @@ Harness.it({ }); // Cast Aliased columns. -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.age_alias.cast('int')), pg: { text : 'SELECT CAST("customer"."age" AS int) FROM "customer"', @@ -185,7 +185,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.name_alias.cast('varchar(10)')), pg: { text : 'SELECT CAST("customer"."name" AS varchar(10)) FROM "customer"', @@ -210,7 +210,7 @@ Harness.it({ params: [] }); // Cast binary expressions for Aliased Column. -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.name_alias.plus(customerAlias.age_alias).cast('varchar(15)')), pg: { text : 'SELECT CAST(("customer"."name" + "customer"."age") AS varchar(15)) FROM "customer"', @@ -236,7 +236,7 @@ Harness.it({ }); // Cast cast expressions for aliased columns. -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.name_alias.cast('varchar(15)').cast('varchar(10)')), pg: { text : 'SELECT CAST(CAST("customer"."name" AS varchar(15)) AS varchar(10)) FROM "customer"', @@ -262,7 +262,7 @@ Harness.it({ }); // Cast in WHERE for aliased columns. -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.name_alias).where(customerAlias.age_alias.cast('int').plus(100).equals(150)), pg: { text : 'SELECT "customer"."name" AS "name_alias" FROM "customer" WHERE ((CAST("customer"."age" AS int) + $1) = $2)', @@ -288,7 +288,7 @@ Harness.it({ }); // Alias cast. -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.age_alias.cast('int').as('age_int')), pg: { text : 'SELECT CAST("customer"."age" AS int) AS "age_int" FROM "customer"', diff --git a/test/dialects/clause-ordering-tests.js b/test/dialects/clause-ordering-tests.js index dbc0bd51..83d2d28e 100644 --- a/test/dialects/clause-ordering-tests.js +++ b/test/dialects/clause-ordering-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); // FROM - SELECT -Harness.it({ +Harness.test({ query: user.from(user.join(post).on(user.id.equals(post.userId))).select(user.name, post.content), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -31,7 +31,7 @@ Harness.it({ }); // WHERE - FROM - SELECT -Harness.it({ +Harness.test({ query: user.where({ name: '' }).from(user).select(user.id), @@ -59,7 +59,7 @@ Harness.it({ }); // SELECT - FROM - WHERE -Harness.it({ +Harness.test({ query: user .select(user.name, post.content) .from(user.join(post).on(user.id.equals(post.userId))) @@ -90,7 +90,7 @@ Harness.it({ }); // SELECT - FROM - WHERE -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where({ name: '' }), diff --git a/test/dialects/create-table-tests.js b/test/dialects/create-table-tests.js index 0e44679c..b1150617 100644 --- a/test/dialects/create-table-tests.js +++ b/test/dialects/create-table-tests.js @@ -15,7 +15,7 @@ var group = Table.define({ ] }); -Harness.it({ +Harness.test({ query: group.create(), pg: { text : 'CREATE TABLE "group" ("id" varchar(100), "user_id" varchar(100))', @@ -40,7 +40,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: group.create().ifNotExists(), pg: { text : 'CREATE TABLE IF NOT EXISTS "group" ("id" varchar(100), "user_id" varchar(100))', @@ -65,7 +65,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -97,7 +97,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -129,7 +129,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -162,7 +162,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -193,7 +193,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -220,7 +220,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -248,7 +248,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'user', columns: [{ @@ -281,7 +281,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -314,7 +314,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'picture', columns: [{ @@ -349,7 +349,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'picture', columns: [{ @@ -381,7 +381,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -409,7 +409,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'membership', columns: { @@ -436,7 +436,7 @@ Harness.it({ // This tests explicitly setting the isTemporary flag to false, as opposed to all the test above here which have it // as undefined. -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -468,7 +468,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -511,7 +511,7 @@ var users = Table.define({ } }); -Harness.it({ +Harness.test({ query: users.create(), pg: { text: 'CREATE TABLE "users" ("id" int PRIMARY KEY REFERENCES "entity"("id") DEFERRABLE INITIALLY DEFERRED)', @@ -537,7 +537,7 @@ Harness.it({ }); // UNIQUE COLUMN TESTS -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -587,7 +587,7 @@ var noUsers = Table.define({ } }); -Harness.it({ +Harness.test({ query: noUsers.create(), pg: { text : 'CREATE TABLE "no_users" ("id" int PRIMARY KEY REFERENCES "entity"("id"))', @@ -612,7 +612,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -646,7 +646,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -680,7 +680,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'post', columns: [{ @@ -715,7 +715,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Table.define({ name: 'replies', columns: [{ diff --git a/test/dialects/create-view-tests.js b/test/dialects/create-view-tests.js index feaa4c71..977f540a 100644 --- a/test/dialects/create-view-tests.js +++ b/test/dialects/create-view-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); //simple view create -Harness.it({ +Harness.test({ query: user.select(user.star()).createView('allUsersView'), pg: { text : '(CREATE VIEW "allUsersView" AS SELECT "user".* FROM "user")', @@ -29,7 +29,7 @@ Harness.it({ }); //create view with parameters -Harness.it({ +Harness.test({ query: user.select(user.star()).where(user.id.equals(1)).createView('oneUserView'), pg: { text : '(CREATE VIEW "oneUserView" AS SELECT "user".* FROM "user" WHERE ("user"."id" = 1))', @@ -54,7 +54,7 @@ Harness.it({ }); //Tests error raised for non-SELECT create view attempts -Harness.it({ +Harness.test({ query: user.delete().where(user.id.equals(1)).createView('oneUserView'), pg: { text : 'Create View requires a Select.', diff --git a/test/dialects/date-tests.js b/test/dialects/date-tests.js index 8637949d..dd2c4d64 100644 --- a/test/dialects/date-tests.js +++ b/test/dialects/date-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib'); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.YEAR(customer.metadata)), pg: { text : 'SELECT EXTRACT(YEAR FROM "customer"."metadata") FROM "customer"', @@ -29,7 +29,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.MONTH(customer.metadata)), pg: { text : 'SELECT EXTRACT(MONTH FROM "customer"."metadata") FROM "customer"', @@ -57,7 +57,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.DAY(customer.metadata)), pg: { text : 'SELECT EXTRACT(DAY FROM "customer"."metadata") FROM "customer"', @@ -82,7 +82,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.HOUR(customer.metadata)), pg: { text : 'SELECT EXTRACT(HOUR FROM "customer"."metadata") FROM "customer"', @@ -110,7 +110,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(Sql.functions.CURRENT_TIMESTAMP()), pg: { text : 'SELECT CURRENT_TIMESTAMP FROM "customer"', @@ -135,7 +135,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:1}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'1 HOUR\')', @@ -148,7 +148,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years:3}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'3 YEAR\')', @@ -161,7 +161,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years:3, months:2}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'3 YEAR 2 MONTH\')', @@ -174,7 +174,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:1, minutes:20}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'1 HOUR 20 MINUTE\')', @@ -187,7 +187,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().plus(Sql.interval({hours:'sql\'injection', minutes:20}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP + INTERVAL \'20 MINUTE\')', @@ -200,7 +200,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({days: 1, hours:5, minutes: 'sql\'injection'}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'1 DAY 5 HOUR\')', @@ -213,7 +213,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(Sql.functions.CURRENT_TIMESTAMP().minus(Sql.interval({years: 2, months: 5}))), pg: { text : 'SELECT (CURRENT_TIMESTAMP - INTERVAL \'2 YEAR 5 MONTH\')', diff --git a/test/dialects/delete-tests.js b/test/dialects/delete-tests.js index cbcee36e..51fe3026 100644 --- a/test/dialects/delete-tests.js +++ b/test/dialects/delete-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: post.delete().where(post.content.equals("hello's world")), pg: { text : 'DELETE FROM "post" WHERE ("post"."content" = $1)', @@ -29,7 +29,7 @@ Harness.it({ params: ["hello's world"] }); -Harness.it({ +Harness.test({ query: post.delete(post).from(post), pg: { text: 'DELETE "post" FROM "post"', @@ -46,7 +46,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.delete([post, post]).from(post), pg: { text: 'DELETE "post", "post" FROM "post"', @@ -63,7 +63,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user .delete(user) .from(user.join(post).on(post.userId.equals(user.id))) @@ -87,7 +87,7 @@ Harness.it({ params: [ 'foo' ] }); -Harness.it({ +Harness.test({ query: post.delete().where({ content: '' }), @@ -114,7 +114,7 @@ Harness.it({ params: [''] }); -Harness.it({ +Harness.test({ query: post.delete({ content: '' }), @@ -141,7 +141,7 @@ Harness.it({ params: [''] }); -Harness.it({ +Harness.test({ query: post.delete({ content: '' }).or(post.content.isNull()), diff --git a/test/dialects/distinct-on-tests.js b/test/dialects/distinct-on-tests.js index 144a0c6e..d238f928 100644 --- a/test/dialects/distinct-on-tests.js +++ b/test/dialects/distinct-on-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: user.select().distinctOn(user.id), pg: { text : 'SELECT DISTINCT ON("user"."id") "user".* FROM "user"', @@ -13,7 +13,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id,user.name).distinctOn(user.id), pg: { text : 'SELECT DISTINCT ON("user"."id") "user"."id", "user"."name" FROM "user"', diff --git a/test/dialects/distinct-tests.js b/test/dialects/distinct-tests.js index e9210a7e..9f922bff 100644 --- a/test/dialects/distinct-tests.js +++ b/test/dialects/distinct-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: user.select(user.id.distinct()), pg: { text : 'SELECT DISTINCT("user"."id") FROM "user"', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id.count().distinct().as('count')), pg: { text : 'SELECT COUNT(DISTINCT("user"."id")) AS "count" FROM "user"', @@ -55,7 +55,7 @@ Harness.it({ // BELOW HERE TEST DISTINCT ON THE ENTIRE RESULTS SET, NOT JUST ONE COLUMN -Harness.it({ +Harness.test({ query: user.select().distinct(), pg: { text : 'SELECT DISTINCT "user".* FROM "user"', @@ -80,7 +80,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id).distinct(), pg: { text : 'SELECT DISTINCT "user"."id" FROM "user"', @@ -105,7 +105,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id,user.name).distinct(), pg: { text : 'SELECT DISTINCT "user"."id", "user"."name" FROM "user"', diff --git a/test/dialects/drop-table-tests.js b/test/dialects/drop-table-tests.js index 4c986b25..eb183e64 100644 --- a/test/dialects/drop-table-tests.js +++ b/test/dialects/drop-table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.drop(), pg: { text : 'DROP TABLE "post"', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.drop().ifExists(), pg: { text : 'DROP TABLE IF EXISTS "post"', @@ -53,7 +53,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.drop().cascade(), pg: { text : 'DROP TABLE "post" CASCADE', @@ -74,7 +74,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.drop().restrict(), pg: { text : 'DROP TABLE "post" RESTRICT', diff --git a/test/dialects/for-share-tests.js b/test/dialects/for-share-tests.js index 41afc727..4b9627fa 100644 --- a/test/dialects/for-share-tests.js +++ b/test/dialects/for-share-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: post.select(post.star()).forShare(), pg: { text : 'SELECT "post".* FROM "post" FOR SHARE', @@ -13,7 +13,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).from(post.join(user).on(user.id.equals(post.userId))).where(post.content.equals('foo')).forShare(), pg: { text : 'SELECT "post".* FROM "post" INNER JOIN "user" ON ("user"."id" = "post"."userId") WHERE ("post"."content" = $1) FOR SHARE', diff --git a/test/dialects/for-update-tests.js b/test/dialects/for-update-tests.js index e2b1d610..19a01e20 100644 --- a/test/dialects/for-update-tests.js +++ b/test/dialects/for-update-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: post.select(post.star()).forUpdate(), pg: { text : 'SELECT "post".* FROM "post" FOR UPDATE', @@ -17,7 +17,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).from(post.join(user).on(user.id.equals(post.userId))).where(post.content.equals('foo')).forUpdate(), pg: { text : 'SELECT "post".* FROM "post" INNER JOIN "user" ON ("user"."id" = "post"."userId") WHERE ("post"."content" = $1) FOR UPDATE', diff --git a/test/dialects/from-clause-tests.js b/test/dialects/from-clause-tests.js index 1883124e..673087db 100644 --- a/test/dialects/from-clause-tests.js +++ b/test/dialects/from-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user).from(post), pg: { text : 'SELECT "user".* FROM "user" , "post"', @@ -28,7 +28,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: user.select(user.star(), post.star()).from(user).from(post), pg: { text : 'SELECT "user".*, "post".* FROM "user" , "post"', @@ -52,7 +52,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user, post), pg: { text : 'SELECT "user".* FROM "user" , "post"', @@ -72,7 +72,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: user.select(user.star()).from([user, post]), pg: { text : 'SELECT "user".* FROM "user" , "post"', diff --git a/test/dialects/function-tests.js b/test/dialects/function-tests.js index 35182156..702d8c63 100644 --- a/test/dialects/function-tests.js +++ b/test/dialects/function-tests.js @@ -5,7 +5,7 @@ var Sql = require('../../lib'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.select(Sql.functions.LENGTH(post.content)), pg: { text : 'SELECT LENGTH("post"."content") FROM "post"', @@ -30,7 +30,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(Sql.functions.LEFT(post.content,4)), pg: { text : 'SELECT LEFT("post"."content", $1) FROM "post"', @@ -55,7 +55,7 @@ Harness.it({ params: [4] }); -Harness.it({ +Harness.test({ query: post.select(Sql.functions.RIGHT(post.content,4)), pg: { text : 'SELECT RIGHT("post"."content", $1) FROM "post"', diff --git a/test/dialects/group-by-tests.js b/test/dialects/group-by-tests.js index f59085b1..673b5639 100644 --- a/test/dialects/group-by-tests.js +++ b/test/dialects/group-by-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.select(post.content).group(post.userId), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId"', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).group(post.userId, post.id), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId", "post"."id"', @@ -53,7 +53,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.arrayAgg()).group(post.userId), pg: { text : 'SELECT array_agg("post"."content") AS "contents" FROM "post" GROUP BY "post"."userId"', @@ -78,7 +78,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.arrayAgg('post contents')).group(post.userId), pg: { text : 'SELECT array_agg("post"."content") AS "post contents" FROM "post" GROUP BY "post"."userId"', @@ -103,7 +103,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).group([post.userId, post.id]), pg: { text : 'SELECT "post"."content" FROM "post" GROUP BY "post"."userId", "post"."id"', diff --git a/test/dialects/having-tests.js b/test/dialects/having-tests.js index 35d5f765..5f8f9cc7 100644 --- a/test/dialects/having-tests.js +++ b/test/dialects/having-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query : post.select(post.userId, post.content.count()).group(post.userId).having(post.userId.gt(10)), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1)', @@ -28,7 +28,7 @@ Harness.it({ params: [10] }); -Harness.it({ +Harness.test({ query : post.select(post.userId, post.content.count()).group(post.userId).having(post.userId.gt(10), post.userId.lt(100)), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1) AND ("post"."userId" < $2)', @@ -53,7 +53,7 @@ Harness.it({ params: [10, 100] }); -Harness.it({ +Harness.test({ query : post.select(post.userId, post.content.count()).group(post.userId).having([post.userId.gt(10), post.userId.lt(100)]), pg : { text : 'SELECT "post"."userId", COUNT("post"."content") AS "content_count" FROM "post" GROUP BY "post"."userId" HAVING ("post"."userId" > $1) AND ("post"."userId" < $2)', diff --git a/test/dialects/hstore-tests.js b/test/dialects/hstore-tests.js index bdaeaa70..54ba2d22 100644 --- a/test/dialects/hstore-tests.js +++ b/test/dialects/hstore-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: customer.update({ metadata: customer.metadata.concat(Sql.functions.HSTORE('age', 20)) }), @@ -15,7 +15,7 @@ Harness.it({ params: ['age', 20] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.key('age')), pg: { text : 'SELECT ("customer"."metadata" -> $1) FROM "customer"', diff --git a/test/dialects/ilike-tests.js b/test/dialects/ilike-tests.js index 58d353ca..aba487ee 100644 --- a/test/dialects/ilike-tests.js +++ b/test/dialects/ilike-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var user = Harness.defineUserTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: post.select(post.content, post.userId).where(post.content.ilike('A%')), pg: { text : 'SELECT "post"."content", "post"."userId" FROM "post" WHERE ("post"."content" ILIKE $1)', @@ -14,7 +14,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.ilike('A%')), pg: { @@ -24,7 +24,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.ilike('A%')), pg: { @@ -34,7 +34,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId) .select(user.id).from(user).where(user.name.ilike('A%')), pg: { diff --git a/test/dialects/in-clause-tests.js b/test/dialects/in-clause-tests.js index ccae8799..513c7243 100644 --- a/test/dialects/in-clause-tests.js +++ b/test/dialects/in-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([])), pg: { text : 'SELECT "post".* FROM "post" WHERE (1=0)', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([1])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1))', @@ -53,7 +53,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NULL)', @@ -78,7 +78,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([1, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2))', @@ -103,7 +103,7 @@ Harness.it({ params: [1, 2] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([null, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NULL)', @@ -128,7 +128,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([1, null, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2) OR "post"."id" IS NULL)', @@ -153,7 +153,7 @@ Harness.it({ params: [1, 2] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.in([1, null, 2, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IN ($1, $2) OR "post"."id" IS NULL)', diff --git a/test/dialects/indexes-tests.js b/test/dialects/indexes-tests.js index 8f518a0e..86b50449 100644 --- a/test/dialects/indexes-tests.js +++ b/test/dialects/indexes-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.indexes(), pg: { text : 'SELECT relname FROM pg_class WHERE oid IN ( SELECT indexrelid FROM pg_index, pg_class WHERE pg_class.relname=\'post\' AND pg_class.relnamespace IN (SELECT pg_namespace.oid FROM pg_namespace WHERE nspname = \'public\') AND pg_class.oid=pg_index.indrelid)', @@ -24,7 +24,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create('index_name').unique().using('btree').on(post.id, post.userId).withParser('foo'), pg: { text : 'CREATE UNIQUE INDEX "index_name" USING BTREE ON "post" ("id","userId") WITH PARSER foo', @@ -45,7 +45,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().fulltext().on(post.id), pg: { text : 'CREATE FULLTEXT INDEX "post_id" ON "post" ("id")', @@ -62,7 +62,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().spatial().on(post.id), pg: { text : 'CREATE SPATIAL INDEX "post_id" ON "post" ("id")', @@ -79,7 +79,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().on(post.userId, post.id), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id")', @@ -100,7 +100,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().on(post.userId).on(post.id), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id")', @@ -121,7 +121,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().on(post.userId, post.id.desc), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id" DESC)', @@ -146,7 +146,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().create().on(post.userId).on(post.id.descending), pg: { text : 'CREATE INDEX "post_id_userId" ON "post" ("userId","id" DESC)', @@ -172,7 +172,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: post.indexes().create(), pg: { text : 'No columns defined!', @@ -192,7 +192,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: post.indexes().drop('index_name'), pg: { text : 'DROP INDEX "public"."index_name"', @@ -213,7 +213,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.indexes().drop(post.userId, post.id), pg: { text : 'DROP INDEX "public"."post_id_userId"', diff --git a/test/dialects/insert-tests.js b/test/dialects/insert-tests.js index 11af31f9..60ba6a62 100644 --- a/test/dialects/insert-tests.js +++ b/test/dialects/insert-tests.js @@ -11,7 +11,7 @@ var arrayTable = require('../../lib/table').define({ columns: ['id', 'numbers'] }); -Harness.it({ +Harness.test({ query: post.insert(post.content.value('test'), post.userId.value(1)), pg: { text : 'INSERT INTO "post" ("content", "userId") VALUES ($1, $2)', @@ -32,7 +32,7 @@ Harness.it({ params: ['test', 1] }); -Harness.it({ +Harness.test({ query: post.insert(post.content.value('whoah')), pg: { text : 'INSERT INTO "post" ("content") VALUES ($1)', @@ -57,7 +57,7 @@ Harness.it({ params: ['whoah'] }); -Harness.it({ +Harness.test({ query: post.insert({length: 0}), pg: { text : 'INSERT INTO "post" ("length") VALUES ($1)', @@ -82,7 +82,7 @@ Harness.it({ params: [0] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -106,7 +106,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: post.sql.functions.LOWER('TEST'), userId: 2 @@ -131,7 +131,7 @@ Harness.it({ }); // allow bulk insert -Harness.it({ +Harness.test({ query: post.insert([{ content: 'whoah' }, { @@ -157,7 +157,7 @@ Harness.it({ params: ['whoah', 'hey'] }); -Harness.it({ +Harness.test({ query: post.insert([{ content: 'whoah', userId: 1 @@ -186,7 +186,7 @@ Harness.it({ }); // consistent order -Harness.it({ +Harness.test({ query: post.insert([{ content: 'whoah', userId: 1 @@ -218,7 +218,7 @@ Harness.it({ params: ['whoah', 1, 'hey', 2] }); -Harness.it({ +Harness.test({ query: post.insert({}), pg: { text : 'INSERT INTO "post" DEFAULT VALUES', @@ -243,7 +243,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert({}).returning('*'), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING *', @@ -264,7 +264,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert({}).returning(post.star()), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING *', @@ -285,7 +285,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert({}).returning(post.id), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id"', @@ -306,7 +306,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert({}).returning(post.id, post.content), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id", "content"', @@ -327,7 +327,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert({}).returning([post.id, post.content]), pg: { text : 'INSERT INTO "post" DEFAULT VALUES RETURNING "id", "content"', @@ -349,7 +349,7 @@ Harness.it({ }); // handle missing columns -Harness.it({ +Harness.test({ query: post.insert([{ content: 'whoah', userId: 1 @@ -383,7 +383,7 @@ Harness.it({ }, }); -Harness.it({ +Harness.test({ query: post.insert([{ userId: 1 }, { @@ -417,7 +417,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: post.insert(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -443,7 +443,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -469,7 +469,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId) .select(user.id).from(user).where(user.name.like('A%')), pg: { @@ -491,7 +491,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId) .select(post.userId).from(user.join(post).on(user.id.equals(post.userId))).where(post.tags.like('A%')), pg: { @@ -517,7 +517,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).select(user.id).distinct().from(user), pg: { text : 'INSERT INTO "post" ("userId") SELECT DISTINCT "user"."id" FROM "user"', @@ -543,7 +543,7 @@ Harness.it({ }); // Binary inserts -Harness.it({ +Harness.test({ query: post.insert(post.content.value(new Buffer('test')), post.userId.value(2)), pg: { text : 'INSERT INTO "post" ("content", "userId") VALUES ($1, $2)', @@ -568,7 +568,7 @@ Harness.it({ params: [new Buffer('test'), 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: new Buffer('test'), userId: 2 @@ -596,7 +596,7 @@ Harness.it({ params: [new Buffer('test'), 2] }); -Harness.it({ +Harness.test({ query: post.insert([{ content: new Buffer('whoah') }, { @@ -627,7 +627,7 @@ Harness.it({ params: [new Buffer('whoah'), new Buffer('hey')] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -653,7 +653,7 @@ Harness.it({ params: ['test', 2, 'testupdate'] }); -Harness.it({ +Harness.test({ query: customerAliasTable.insert({ id : 2, name : 'test' @@ -680,7 +680,7 @@ Harness.it({ params: [2, 'test'] }); -Harness.it({ +Harness.test({ query: customerAliasTable.insert({ id : 2, name : 'test' @@ -704,7 +704,7 @@ Harness.it({ params: [2, 'test'] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -731,7 +731,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -758,7 +758,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -785,7 +785,7 @@ Harness.it({ params: ['test', 2, 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -812,7 +812,7 @@ Harness.it({ params: ['test', 2, 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -838,7 +838,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.insert({ content: 'test', userId: 2 @@ -864,7 +864,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: contentTable.insert({ contentId: 20, text : "something" @@ -890,7 +890,7 @@ Harness.it({ params: [20, "something"] }); -Harness.it({ +Harness.test({ query: contentTable.insert({ contentId: 20, text : "something", @@ -918,7 +918,7 @@ Harness.it({ params: [20, "something", "another thing"] }); -Harness.it({ +Harness.test({ query: post.insert([]), mysql: { @@ -928,7 +928,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value([2, 3, 4])), pg: { text : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)', @@ -948,7 +948,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: arrayTable.insert(arrayTable.id.value(1), arrayTable.numbers.value(["one", "two", "three"])), pg: { text : 'INSERT INTO "arraytest" ("id", "numbers") VALUES ($1, $2)', @@ -968,7 +968,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).select(user.id).from(user), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -993,7 +993,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).select(user.id).from(user).onConflict({ columns: ['userId'], update: ['content'] @@ -1017,7 +1017,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).add(user.select(user.id)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -1042,7 +1042,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).add(user.select(user.id).from(user)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user"', @@ -1067,7 +1067,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.insert(post.userId).add(user.select(user.id).order(user.id)), pg: { text : 'INSERT INTO "post" ("userId") SELECT "user"."id" FROM "user" ORDER BY "user"."id"', diff --git a/test/dialects/join-tests.js b/test/dialects/join-tests.js index db97b905..2e0c6882 100644 --- a/test/dialects/join-tests.js +++ b/test/dialects/join-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var comment = Harness.defineCommentTable(); -Harness.it({ +Harness.test({ query: user.select(user.name, post.content).from(user.join(post).on(user.id.equals(post.userId))), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -30,7 +30,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.join(post).on(user.id.equals(post.userId)), pg: { text : '"user" INNER JOIN "post" ON ("user"."id" = "post"."userId")', @@ -55,7 +55,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user .select(user.name, post.content, comment.text) .from( @@ -85,7 +85,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.name, post.content).from(user.leftJoin(post).on(user.id.equals(post.userId))), pg: { text : 'SELECT "user"."name", "post"."content" FROM "user" LEFT JOIN "post" ON ("user"."id" = "post"."userId")', @@ -110,7 +110,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user .select(user.name, post.content) .from( @@ -147,7 +147,7 @@ var subposts = post post.userId.as('subpostUserId')) .from(post); -Harness.it({ +Harness.test({ query: user .select(user.name, subposts.content) .from(user.join(subposts) @@ -175,7 +175,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select().from(user.leftJoinLateral(post.subQuery().select(post.userId))), pg: { text : 'SELECT "user".* FROM "user" LEFT JOIN LATERAL (SELECT "post"."userId" FROM "post") ON true', @@ -192,7 +192,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select().from(user.leftJoinLateral(post.subQuery().select(post.userId).where(user.id.equals(post.userId)))), pg: { text : 'SELECT "user".* FROM "user" LEFT JOIN LATERAL (SELECT "post"."userId" FROM "post" WHERE ("user"."id" = "post"."userId")) ON true', @@ -209,7 +209,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select().from(user .leftJoinLateral(post.subQuery().select(post.userId)) .leftJoinLateral(comment.subQuery().select(comment.postId))), diff --git a/test/dialects/join-to-tests.js b/test/dialects/join-to-tests.js index b70c16a8..d50f8817 100644 --- a/test/dialects/join-to-tests.js +++ b/test/dialects/join-to-tests.js @@ -36,7 +36,7 @@ var post = sql.define({ } }); -Harness.it({ +Harness.test({ query: user.joinTo(post), pg: { text : '"user" INNER JOIN "post" ON ("user"."id" = "post"."ownerId")', @@ -61,7 +61,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.joinTo(user), pg: { text : '"post" INNER JOIN "user" ON ("user"."id" = "post"."ownerId")', @@ -86,7 +86,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.joinTo(photo), pg: { text : '"user" INNER JOIN "photo" ON ("user"."id" = "photo"."ownerId")', diff --git a/test/dialects/json-tests.js b/test/dialects/json-tests.js index b539ddba..b610b96f 100644 --- a/test/dialects/json-tests.js +++ b/test/dialects/json-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.key('age')), pg: { text : 'SELECT ("customer"."metadata" -> $1) FROM "customer"', @@ -13,7 +13,7 @@ Harness.it({ params: ['age'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.keyText('age')), pg: { text : 'SELECT ("customer"."metadata" ->> $1) FROM "customer"', @@ -22,7 +22,7 @@ Harness.it({ params: ['age'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.path('{address,city}')), pg: { text : 'SELECT ("customer"."metadata" #> $1) FROM "customer"', @@ -31,7 +31,7 @@ Harness.it({ params: ['{address,city}'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.pathText('{address,city}')), pg: { text : 'SELECT ("customer"."metadata" #>> $1) FROM "customer"', diff --git a/test/dialects/limit-and-offset-tests.js b/test/dialects/limit-and-offset-tests.js index 9e29809d..6561c14b 100644 --- a/test/dialects/limit-and-offset-tests.js +++ b/test/dialects/limit-and-offset-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); // For compatibility with PostgreSQL, MySQL also supports the LIMIT row_count OFFSET offset syntax. // http://dev.mysql.com/doc/refman/5.0/en/select.html -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user).order(user.name.asc).limit(1), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" LIMIT 1', @@ -27,7 +27,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user).order(user.name.asc).limit(3).offset(6), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" LIMIT 3 OFFSET 6', @@ -48,7 +48,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user).order(user.name.asc).offset(10), pg: { text : 'SELECT "user".* FROM "user" ORDER BY "user"."name" OFFSET 10', @@ -73,7 +73,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star()).where({ name: 'John' }).offset(user.subQuery().select('FLOOR(RANDOM() * COUNT(*))').where({ diff --git a/test/dialects/literal-tests.js b/test/dialects/literal-tests.js index c7e3bdff..c31d4271 100644 --- a/test/dialects/literal-tests.js +++ b/test/dialects/literal-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: user.select(user.literal('foo'), user.name, user.literal('123').as('onetwothree')), pg: { text : 'SELECT foo, "user"."name", 123 AS "onetwothree" FROM "user"', @@ -25,7 +25,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: user.select().where(user.literal('foo = bar')), pg: { text : 'SELECT "user".* FROM "user" WHERE foo = bar', @@ -50,7 +50,7 @@ Harness.it({ // This could be less than 10 (the limit) if we are on the last page. var subquery = user.subQuery('subquery_for_count').select(user.literal(1).as('count_column')).limit(10).offset(20); -Harness.it({ +Harness.test({ query: user.select(subquery.count_column.count()).from(subquery), pg: { text : 'SELECT COUNT("subquery_for_count"."count_column") AS "count_column_count" FROM (SELECT 1 AS "count_column" FROM "user" LIMIT 10 OFFSET 20) "subquery_for_count"', diff --git a/test/dialects/matches-test.js b/test/dialects/matches-test.js index d26cad38..c385641c 100644 --- a/test/dialects/matches-test.js +++ b/test/dialects/matches-test.js @@ -6,7 +6,7 @@ var customerAlias = Harness.defineCustomerAliasTable(); var sql = require(__dirname + '/../../lib').setDialect('postgres'); //Postgres needs the to_tsquery function to use with @@ operator -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.content.match(sql.functions.TO_TSQUERY('hello'))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."content" @@ TO_TSQUERY($1))', @@ -16,7 +16,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.content.match('hello')), sqlite: { text : 'SELECT "post".* FROM "post" WHERE ("post"."content" MATCH $1)', @@ -38,7 +38,7 @@ Harness.it({ }); //matches, ordered by best rank first -Harness.it({ +Harness.test({ query: post.select(post.id, sql.functions.TS_RANK_CD(post.content, sql.functions.TO_TSQUERY('hello')).as('rank')). where(post.content.match(sql.functions.TO_TSQUERY('hello'))).order(sql.functions.TS_RANK_CD(post.content, sql.functions.TO_TSQUERY('hello')).descending()), pg: { diff --git a/test/dialects/namespace-tests.js b/test/dialects/namespace-tests.js index ed6800bf..5f6b4a56 100644 --- a/test/dialects/namespace-tests.js +++ b/test/dialects/namespace-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var u = user.as('u'); -Harness.it({ +Harness.test({ query: u.select(u.name).from(u), pg: { text : 'SELECT "u"."name" FROM "user" AS "u"', @@ -31,7 +31,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: u.select(u.star()).from(u), pg: { text : 'SELECT "u".* FROM "user" AS "u"', @@ -57,7 +57,7 @@ Harness.it({ }); var p = post.as('p'); -Harness.it({ +Harness.test({ query: u.select(u.name).from(u.join(p).on(u.id.equals(p.userId).and(p.id.equals(3)))), pg: { text : 'SELECT "u"."name" FROM "user" AS "u" INNER JOIN "post" AS "p" ON (("u"."id" = "p"."userId") AND ("p"."id" = $1))', @@ -82,7 +82,7 @@ Harness.it({ params: [3] }); -Harness.it({ +Harness.test({ query: u.select(p.content, u.name).from(u.join(p).on(u.id.equals(p.userId).and(p.content.isNotNull()))), pg: { text : 'SELECT "p"."content", "u"."name" FROM "user" AS "u" INNER JOIN "post" AS "p" ON (("u"."id" = "p"."userId") AND ("p"."content" IS NOT NULL))', @@ -120,7 +120,7 @@ var comment = Table.define({ ] }); -Harness.it({ +Harness.test({ query: comment.select(comment.text, comment.userId), pg: { text : 'SELECT "comment"."text", "comment"."userId" FROM "comment"', diff --git a/test/dialects/not-in-clause-tests.js b/test/dialects/not-in-clause-tests.js index 753a845d..11647fee 100644 --- a/test/dialects/not-in-clause-tests.js +++ b/test/dialects/not-in-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([])), pg: { text : 'SELECT "post".* FROM "post" WHERE (1=1)', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([1])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" NOT IN ($1))', @@ -53,7 +53,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NOT NULL)', @@ -78,7 +78,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([1, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" NOT IN ($1, $2))', @@ -103,7 +103,7 @@ Harness.it({ params: [1, 2] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([null, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."id" IS NOT NULL)', @@ -128,7 +128,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([1, null, 2])), pg: { text : 'SELECT "post".* FROM "post" WHERE (NOT ("post"."id" IN ($1, $2) OR "post"."id" IS NULL))', @@ -153,7 +153,7 @@ Harness.it({ params: [1, 2] }); -Harness.it({ +Harness.test({ query: post.select(post.star()).where(post.id.notIn([1, null, 2, null])), pg: { text : 'SELECT "post".* FROM "post" WHERE (NOT ("post"."id" IN ($1, $2) OR "post"."id" IS NULL))', diff --git a/test/dialects/order-tests.js b/test/dialects/order-tests.js index 89addda0..a0813d8e 100644 --- a/test/dialects/order-tests.js +++ b/test/dialects/order-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); var sql = require('../../lib'); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content"', @@ -29,7 +29,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content, post.userId.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -54,7 +54,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content.asc, post.userId.desc), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -79,7 +79,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order([post.content, post.userId.descending]), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -104,7 +104,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content).order(post.userId.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content", "post"."userId" DESC', @@ -129,7 +129,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.isNull()).order(post.content.isNull()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL)', @@ -154,7 +154,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.isNull()).order(post.content.isNull().descending()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL) DESC', @@ -179,7 +179,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content.isNull()).order(post.content.isNull()), pg: { text : 'SELECT ("post"."content" IS NULL) FROM "post" ORDER BY ("post"."content" IS NULL)', @@ -204,7 +204,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(sql.functions.RTRIM(post.content)).order(sql.functions.RTRIM(post.content)), pg: { text : 'SELECT RTRIM("post"."content") FROM "post" ORDER BY RTRIM("post"."content")', @@ -229,7 +229,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(sql.functions.RTRIM(post.content)).order(sql.functions.RTRIM(post.content).descending()), pg: { text : 'SELECT RTRIM("post"."content") FROM "post" ORDER BY RTRIM("post"."content") DESC', @@ -254,7 +254,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content.descending), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" DESC NULLS LAST', @@ -282,7 +282,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" NULLS LAST', @@ -310,7 +310,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order(post.content.asc), pg: { text : 'SELECT "post"."content" FROM "post" ORDER BY "post"."content" NULLS FIRST', @@ -338,7 +338,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).order([]), pg: { text : 'SELECT "post"."content" FROM "post"', diff --git a/test/dialects/regex-tests.js b/test/dialects/regex-tests.js index a98c6697..40dde618 100644 --- a/test/dialects/regex-tests.js +++ b/test/dialects/regex-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.regex('age')), pg: { text : 'SELECT ("customer"."metadata" ~ $1) FROM "customer"', @@ -13,7 +13,7 @@ Harness.it({ params: ['age'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.iregex('age')), pg: { text : 'SELECT ("customer"."metadata" ~* $1) FROM "customer"', @@ -22,7 +22,7 @@ Harness.it({ params: ['age'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.notRegex('age')), pg: { text : 'SELECT ("customer"."metadata" !~ $1) FROM "customer"', @@ -31,7 +31,7 @@ Harness.it({ params: ['age'] }); -Harness.it({ +Harness.test({ query: customer.select(customer.metadata.notIregex('age')), pg: { text : 'SELECT ("customer"."metadata" !~* $1) FROM "customer"', diff --git a/test/dialects/replace-tests.js b/test/dialects/replace-tests.js index 9b780e7f..72af0e4b 100644 --- a/test/dialects/replace-tests.js +++ b/test/dialects/replace-tests.js @@ -11,7 +11,7 @@ var arrayTable = require('../../lib/table').define({ columns: ['id', 'numbers'] }); -Harness.it({ +Harness.test({ query: post.replace(post.content.value('test'), post.userId.value(1)), pg: { throws: true @@ -33,7 +33,7 @@ Harness.it({ params: ['test', 1] }); -Harness.it({ +Harness.test({ query: post.replace(post.content.value('whoah')), pg: { throws: true @@ -55,7 +55,7 @@ Harness.it({ params: ['whoah'] }); -Harness.it({ +Harness.test({ query: post.replace({length: 0}), pg: { throws: true @@ -77,7 +77,7 @@ Harness.it({ params: [0] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -98,7 +98,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: post.sql.functions.LOWER('TEST'), userId: 2 @@ -120,7 +120,7 @@ Harness.it({ }); // allow bulk replace -Harness.it({ +Harness.test({ query: post.replace([{ content: 'whoah' }, { @@ -143,7 +143,7 @@ Harness.it({ params: ['whoah', 'hey'] }); -Harness.it({ +Harness.test({ query: post.replace([{ content: 'whoah', userId: 1 @@ -169,7 +169,7 @@ Harness.it({ }); // consistent order -Harness.it({ +Harness.test({ query: post.replace([{ content: 'whoah', userId: 1 @@ -198,7 +198,7 @@ Harness.it({ params: ['whoah', 1, 'hey', 2] }); -Harness.it({ +Harness.test({ query: post.replace({}), pg: { throws: true @@ -220,7 +220,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace({}).returning('*'), pg: { throws: true @@ -240,7 +240,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace({}).returning(post.star()), pg: { throws: true @@ -260,7 +260,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace({}).returning(post.id), pg: { throws: true @@ -280,7 +280,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace({}).returning(post.id, post.content), pg: { throws: true @@ -300,7 +300,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace({}).returning([post.id, post.content]), pg: { throws: true @@ -321,7 +321,7 @@ Harness.it({ }); // handle missing columns -Harness.it({ +Harness.test({ query: post.replace([{ content: 'whoah', userId: 1 @@ -349,7 +349,7 @@ Harness.it({ }, }); -Harness.it({ +Harness.test({ query: post.replace([{ userId: 1 }, { @@ -377,7 +377,7 @@ Harness.it({ }, }); -Harness.it({ +Harness.test({ query: post.replace(post.content, post.userId) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -400,7 +400,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.replace([post.content, post.userId]) .select('\'test\'', user.id).from(user).where(user.name.like('A%')), pg: { @@ -423,7 +423,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId) .select(user.id).from(user).where(user.name.like('A%')), pg: { @@ -442,7 +442,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId) .select(post.userId).from(user.join(post).on(user.id.equals(post.userId))).where(post.tags.like('A%')), pg: { @@ -465,7 +465,7 @@ Harness.it({ params: ['A%'] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).select(user.id).distinct().from(user), pg: { throws: true @@ -488,7 +488,7 @@ Harness.it({ }); // Binary replaces -Harness.it({ +Harness.test({ query: post.replace(post.content.value(new Buffer('test')), post.userId.value(2)), pg: { throws: true @@ -510,7 +510,7 @@ Harness.it({ params: [new Buffer('test'), 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: new Buffer('test'), userId: 2 @@ -535,7 +535,7 @@ Harness.it({ params: [new Buffer('test'), 2] }); -Harness.it({ +Harness.test({ query: post.replace([{ content: new Buffer('whoah') }, { @@ -562,7 +562,7 @@ Harness.it({ params: [new Buffer('whoah'), new Buffer('hey')] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -588,7 +588,7 @@ Harness.it({ params: ['test', 2, 'testupdate'] }); -Harness.it({ +Harness.test({ query: customerAliasTable.replace({ id : 2, name : 'test' @@ -614,7 +614,7 @@ Harness.it({ params: [2, 'test'] }); -Harness.it({ +Harness.test({ query: customerAliasTable.replace({ id : 2, name : 'test' @@ -638,7 +638,7 @@ Harness.it({ params: [2, 'test'] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -664,7 +664,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -690,7 +690,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -716,7 +716,7 @@ Harness.it({ params: ['test', 2, 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -742,7 +742,7 @@ Harness.it({ params: ['test', 2, 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -767,7 +767,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: post.replace({ content: 'test', userId: 2 @@ -792,7 +792,7 @@ Harness.it({ params: ['test', 2] }); -Harness.it({ +Harness.test({ query: contentTable.replace({ contentId: 20, text : "something" @@ -817,7 +817,7 @@ Harness.it({ params: [20, "something"] }); -Harness.it({ +Harness.test({ query: contentTable.replace({ contentId: 20, text : "something", @@ -844,7 +844,7 @@ Harness.it({ params: [20, "something", "another thing"] }); -Harness.it({ +Harness.test({ query: post.replace([]), mysql: { @@ -854,7 +854,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: arrayTable.replace(arrayTable.id.value(1), arrayTable.numbers.value([2, 3, 4])), pg: { throws: true @@ -871,7 +871,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: arrayTable.replace(arrayTable.id.value(1), arrayTable.numbers.value(["one", "two", "three"])), pg: { throws: true @@ -888,7 +888,7 @@ Harness.it({ } }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).select(user.id).from(user), pg: { throws: true @@ -910,7 +910,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).select(user.id).from(user).onConflict({ columns: ['userId'], update: ['content'] @@ -933,7 +933,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).add(user.select(user.id)), pg: { throws: true @@ -955,7 +955,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).add(user.select(user.id).from(user)), pg: { throws: true @@ -977,7 +977,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.replace(post.userId).add(user.select(user.id).order(user.id)), pg: { throws: true diff --git a/test/dialects/returning-tests.js b/test/dialects/returning-tests.js index 5ebff153..ebbb0b2e 100644 --- a/test/dialects/returning-tests.js +++ b/test/dialects/returning-tests.js @@ -1,7 +1,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: user.insert({name: 'joe'}).returning(), pg: { text : 'INSERT INTO "user" ("name") VALUES ($1) RETURNING *', @@ -10,7 +10,7 @@ Harness.it({ params: ['joe'] }); -Harness.it({ +Harness.test({ query: user.insert({name: 'joe'}).returning('id'), pg: { text : 'INSERT INTO "user" ("name") VALUES ($1) RETURNING id', diff --git a/test/dialects/schema-tests.js b/test/dialects/schema-tests.js index 05787630..11e330da 100644 --- a/test/dialects/schema-tests.js +++ b/test/dialects/schema-tests.js @@ -10,7 +10,7 @@ var userWithSchema = Table.define({ columns: ['id', 'name'] }); -Harness.it({ +Harness.test({ query: userWithSchema.select(userWithSchema.id).from(userWithSchema), pg: { text : 'SELECT "staging"."user"."id" FROM "staging"."user"', @@ -35,7 +35,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: userWithSchema.select(userWithSchema.id.count()).from(userWithSchema), pg: { text : 'SELECT COUNT("staging"."user"."id") AS "id_count" FROM "staging"."user"', @@ -60,7 +60,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: userWithSchema.select(userWithSchema.id, userWithSchema.name).from(userWithSchema), pg: { text : 'SELECT "staging"."user"."id", "staging"."user"."name" FROM "staging"."user"', @@ -86,7 +86,7 @@ Harness.it({ }); var uws = userWithSchema.as('uws'); -Harness.it({ +Harness.test({ query: uws.select(uws.name).from(uws), pg: { text : 'SELECT "uws"."name" FROM "staging"."user" AS "uws"', @@ -117,7 +117,7 @@ var postWithSchema = Table.define({ columns: ['id', 'userId', 'content'] }); -Harness.it({ +Harness.test({ query: userWithSchema.select(userWithSchema.name, postWithSchema.content).from(userWithSchema.join(postWithSchema).on(userWithSchema.id.equals(postWithSchema.userId))), pg: { text : 'SELECT "staging"."user"."name", "dev"."post"."content" FROM "staging"."user" INNER JOIN "dev"."post" ON ("staging"."user"."id" = "dev"."post"."userId")', @@ -142,7 +142,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: uws.select(uws.name, postWithSchema.content).from(uws.join(postWithSchema).on(uws.id.equals(postWithSchema.userId))), pg: { text : 'SELECT "uws"."name", "dev"."post"."content" FROM "staging"."user" AS "uws" INNER JOIN "dev"."post" ON ("uws"."id" = "dev"."post"."userId")', diff --git a/test/dialects/select-tests.js b/test/dialects/select-tests.js index 03ca6c53..2892c8ae 100644 --- a/test/dialects/select-tests.js +++ b/test/dialects/select-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var customerAlias = Harness.defineCustomerAliasTable(); var Sql = require('../../lib'); -Harness.it({ +Harness.test({ query: post.select(post.id).select(post.content), pg: { text : 'SELECT "post"."id", "post"."content" FROM "post"', @@ -31,7 +31,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customerAlias.select(customerAlias.star()), pg: { text : 'SELECT "customer"."id" AS "id_alias", "customer"."name" AS "name_alias", "customer"."age" AS "age_alias", "customer"."income" AS "income_alias", "customer"."metadata" AS "metadata_alias" FROM "customer"', @@ -57,7 +57,7 @@ Harness.it({ }); // Test that we can generate a SELECT claus without a FROM clause -Harness.it({ +Harness.test({ query: Sql.select(), pg: { text : 'SELECT ', @@ -83,7 +83,7 @@ Harness.it({ }); // Test that we can generate a SELECT claus without a FROM clause -Harness.it({ +Harness.test({ query: Sql.select("1"), pg: { text : 'SELECT 1', @@ -108,7 +108,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select("1").where("1=1"), pg: { text : 'SELECT 1 WHERE (1=1)', @@ -133,7 +133,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(post.select(post.id)), pg: { text : 'SELECT (SELECT "post"."id" FROM "post")', @@ -158,7 +158,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(post.select(post.content).plus(post.select(post.content))), pg: { text : 'SELECT ((SELECT "post"."content" FROM "post") + (SELECT "post"."content" FROM "post"))', @@ -183,7 +183,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id.as('col1')), pg: { text : 'SELECT "post"."id" AS "col1" FROM "post"', @@ -208,7 +208,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(4)), pg: { text : 'SELECT $1 FROM "post"', @@ -233,7 +233,7 @@ Harness.it({ params: [4] }); -Harness.it({ +Harness.test({ query: post.select(post.id,Sql.constant(4)), pg: { text : 'SELECT "post"."id", $1 FROM "post"', @@ -258,7 +258,7 @@ Harness.it({ params: [4] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(4).as('col1')), pg: { text : 'SELECT $1 AS "col1" FROM "post"', @@ -283,7 +283,7 @@ Harness.it({ params: [4] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(4).plus(5)), pg: { text : 'SELECT ($1 + $2) FROM "post"', @@ -308,7 +308,7 @@ Harness.it({ params: [4,5] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(4).plus(5).as('col1')), pg: { text : 'SELECT ($1 + $2) AS "col1" FROM "post"', @@ -333,7 +333,7 @@ Harness.it({ params: [4,5] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(4),Sql.constant("abc"),Sql.constant(true)), pg: { text : 'SELECT $1, $2, $3 FROM "post"', @@ -358,7 +358,7 @@ Harness.it({ params: [4,'abc',true] }); -Harness.it({ +Harness.test({ query: post.select(Sql.constant(1).sum()), pg: { text : 'SELECT SUM($1) AS "constant_sum" FROM "post"', @@ -383,7 +383,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: Sql.select(post.select(post.id).as("column1")), pg: { text : 'SELECT (SELECT "post"."id" FROM "post") AS "column1"', @@ -408,7 +408,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(post.select(post.count()).as("column1")), pg: { text : 'SELECT (SELECT COUNT("post".*) AS "post_count" FROM "post") AS "column1"', @@ -433,7 +433,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: Sql.select(post.select(post.id).as("column1"),user.select(user.id).as("column2")), pg: { text : 'SELECT (SELECT "post"."id" FROM "post") AS "column1", (SELECT "user"."id" FROM "user") AS "column2"', diff --git a/test/dialects/shortcut-tests.js b/test/dialects/shortcut-tests.js index 88c3c826..35c9a90b 100644 --- a/test/dialects/shortcut-tests.js +++ b/test/dialects/shortcut-tests.js @@ -5,7 +5,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); // shortcut: 'select * from
' -Harness.it({ +Harness.test({ query: user, pg: { text : 'SELECT "user".* FROM "user"', @@ -30,7 +30,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.where(user.name.equals(3)), pg: { text : 'SELECT * FROM "user" WHERE ("user"."name" = $1)', @@ -55,7 +55,7 @@ Harness.it({ params: [3] }); -Harness.it({ +Harness.test({ query: user.where(user.name.equals(3)).where(user.id.equals(1)), pg: { text : 'SELECT * FROM "user" WHERE (("user"."name" = $1) AND ("user"."id" = $2))', @@ -81,7 +81,7 @@ Harness.it({ }); // shortcut: no 'from' -Harness.it({ +Harness.test({ query: post.select(post.content), pg: { text : 'SELECT "post"."content" FROM "post"', @@ -106,7 +106,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.content).where(post.userId.equals(1)), pg: { text : 'SELECT "post"."content" FROM "post" WHERE ("post"."userId" = $1)', @@ -131,7 +131,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: post.where(post.content.isNull()).or({ content: '' }).and({ diff --git a/test/dialects/subfield-tests.js b/test/dialects/subfield-tests.js index a83f1f0e..aeaab51d 100644 --- a/test/dialects/subfield-tests.js +++ b/test/dialects/subfield-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerCompositeTable(); var Sql = require('../../lib').setDialect('postgres'); -Harness.it({ +Harness.test({ query: customer.select(customer.info.subfields.age), pg: { text : 'SELECT ("customer"."info")."age" FROM "customer"', @@ -14,7 +14,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: customer.select(customer.info.subfields.age.as('years')), pg: { text : 'SELECT ("customer"."info")."age" AS "years" FROM "customer"', @@ -23,7 +23,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.select(customer.id).where(customer.info.subfields.salary.equals(10)), pg: { text : 'SELECT "customer"."id" FROM "customer" WHERE (("customer"."info")."salary" = $1)', @@ -32,7 +32,7 @@ Harness.it({ params: [10] }); -Harness.it({ +Harness.test({ query: customer.select(customer.info.subfields.name.distinct()), pg: { text : 'SELECT DISTINCT(("customer"."info")."name") FROM "customer"', diff --git a/test/dialects/subquery-tests.js b/test/dialects/subquery-tests.js index 580df437..05d76f1f 100644 --- a/test/dialects/subquery-tests.js +++ b/test/dialects/subquery-tests.js @@ -6,7 +6,7 @@ var user = Harness.defineUserTable(); var post = Harness.definePostTable(); var Sql = require('../../lib'); -Harness.it({ +Harness.test({ query: user.select(user.name).where(user.id.in(post.select(post.userId))), pg: { text: 'SELECT "user"."name" FROM "user" WHERE ("user"."id" IN (SELECT "post"."userId" FROM "post"))', @@ -31,7 +31,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.name.in( customer.subQuery().select(customer.name).where( user.name.in( @@ -60,7 +60,7 @@ Harness.it({ params: ['%HELLO%'] }); -Harness.it({ +Harness.test({ query: Sql.select('*').from(user.subQuery()), pg: { text : 'SELECT * FROM (SELECT * FROM "user")', @@ -86,7 +86,7 @@ Harness.it({ }); // Subquery with a date -Harness.it({ +Harness.test({ query: Sql.select('*').from(post.subQuery().where(post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')))), pg: { text : 'SELECT * FROM (SELECT * FROM "post" WHERE ("post"."content" = $1))', @@ -115,7 +115,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: Sql.select('*').from(customer.subQuery('T1')).from(user.subQuery('T2')), pg: { text : 'SELECT * FROM (SELECT * FROM "customer") "T1" , (SELECT * FROM "user") "T2"', @@ -140,7 +140,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: customer.name.between( customer.subQuery().select(Sql.functions.MIN(customer.name)), customer.subQuery().select(Sql.functions.MAX(customer.name)) @@ -168,7 +168,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.subQuery().where(user.name.equals(customer.name)).exists(), pg: { text : '(EXISTS (SELECT * FROM "user" WHERE ("user"."name" = "customer"."name")))', @@ -194,7 +194,7 @@ Harness.it({ }); var limitUsers = user.subQuery('limit-users').select(user.id, user.name).from(user).order(user.name).limit(10).offset(10); -Harness.it({ +Harness.test({ query: Sql.select(limitUsers.name, post.tags).from(limitUsers.leftJoin(post).on(post.userId.equals(limitUsers.id))), pg: { text : 'SELECT "limit-users"."name", "post"."tags" FROM (SELECT "user"."id", "user"."name" FROM "user" ORDER BY "user"."name" LIMIT 10 OFFSET 10) "limit-users" LEFT JOIN "post" ON ("post"."userId" = "limit-users"."id")', @@ -220,7 +220,7 @@ Harness.it({ }); // Top-level subQuery -Harness.it({ +Harness.test({ query: Sql.subQuery().select(user.id).from(user), pg: { text : '(SELECT "user"."id" FROM "user")', @@ -246,7 +246,7 @@ Harness.it({ }); // Top-level subQuery with alias -Harness.it({ +Harness.test({ query: Sql.subQuery("x").select(user.id).from(user), pg: { text : '(SELECT "user"."id" FROM "user") "x"', diff --git a/test/dialects/support.js b/test/dialects/support.js index 79633356..5739b3da 100644 --- a/test/dialects/support.js +++ b/test/dialects/support.js @@ -13,7 +13,7 @@ var dialects = { }; module.exports = { - it: function(expected) { + test: function(expected) { // for each dialect Object.keys(dialects).forEach(function(dialect) { var expectedObject = expected[dialect]; diff --git a/test/dialects/table-tests.js b/test/dialects/table-tests.js index cb1b80e7..6740a7c8 100644 --- a/test/dialects/table-tests.js +++ b/test/dialects/table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user), pg: { text : 'SELECT "user"."id" FROM "user"', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id, user.name).from(user), pg: { text : 'SELECT "user"."id", "user"."name" FROM "user"', @@ -53,7 +53,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star()).from(user), pg: { text : 'SELECT "user".* FROM "user"', @@ -78,7 +78,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id, [ user.name ]).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -99,7 +99,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select([ user.id ], user.name).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -120,7 +120,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select([ user.id , user.name ]).from(user), pg: { text: 'SELECT "user"."id", "user"."name" FROM "user"', @@ -141,7 +141,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star(), user.star({ prefix: 'foo_' }), user.star({ prefix: 'bar_' })).from(user), pg: { text: 'SELECT "user".*, "user"."id" AS "foo_id", "user"."name" AS "foo_name", "user"."id" AS "bar_id", "user"."name" AS "bar_name" FROM "user"', @@ -162,7 +162,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.equals('foo')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ("user"."name" = $1)', @@ -187,7 +187,7 @@ Harness.it({ params: ['foo'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.equals('foo').or(user.name.equals('bar'))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) OR ("user"."name" = $2))', @@ -212,7 +212,7 @@ Harness.it({ params: ['foo', 'bar'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.equals('foo').and(user.name.equals('bar'))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) AND ("user"."name" = $2))', @@ -237,7 +237,7 @@ Harness.it({ params: ['foo', 'bar'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.equals('foo')).or(user.name.equals('bar')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" = $1) OR ("user"."name" = $2))', @@ -262,7 +262,7 @@ Harness.it({ params: ['foo', 'bar'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.equals('foo')).or(user.name.equals('baz')).and(user.name.equals('bar')), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ((("user"."name" = $1) OR ("user"."name" = $2)) AND ("user"."name" = $3))', @@ -287,7 +287,7 @@ Harness.it({ params: ['foo', 'baz', 'bar'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.in(['foo', 'bar'])), pg: { text : 'SELECT "user"."id" FROM "user" WHERE ("user"."name" IN ($1, $2))', @@ -312,7 +312,7 @@ Harness.it({ params: ['foo', 'bar'] }); -Harness.it({ +Harness.test({ query: user.select(user.id).from(user).where(user.name.in(['foo', 'bar']).and(user.id.equals(1))), pg: { text : 'SELECT "user"."id" FROM "user" WHERE (("user"."name" IN ($1, $2)) AND ("user"."id" = $3))', @@ -337,7 +337,7 @@ Harness.it({ params: ['foo', 'bar', 1] }); -Harness.it({ +Harness.test({ query: user.select(user.columns), pg: { text : 'SELECT "user"."id", "user"."name" FROM "user"', @@ -363,7 +363,7 @@ Harness.it({ }); -Harness.it({ +Harness.test({ query: user .select(user.id) .from(user) @@ -394,7 +394,7 @@ Harness.it({ params: ['boom', 1, 'bang', 2] }); -Harness.it({ +Harness.test({ query: user.select(user.name.as('user name'), user.id.as('user id')).from(user), pg: { text : 'SELECT "user"."name" AS "user name", "user"."id" AS "user id" FROM "user"', @@ -419,7 +419,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.name.as('user name')).from(user).where(user.name.equals('brian')), pg: { text : 'SELECT "user"."name" AS "user name" FROM "user" WHERE ("user"."name" = $1)', @@ -444,7 +444,7 @@ Harness.it({ params: ['brian'] }); -Harness.it({ +Harness.test({ query: user.select(user.name).from(user).where(user.name.equals('brian')), pg: { text : 'SELECT "user"."name" FROM "user" WHERE ("user"."name" = $1)', @@ -469,7 +469,7 @@ Harness.it({ params: ['brian'] }); -Harness.it({ +Harness.test({ query: user.select('name').from('user').where('name <> NULL'), pg: { text : 'SELECT name FROM user WHERE (name <> NULL)', @@ -494,7 +494,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select('name,id').from('user').where('name <> NULL'), pg: { text : 'SELECT name,id FROM user WHERE (name <> NULL)', @@ -519,7 +519,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select('name', 'id').from('user').where('name <> NULL'), pg: { text : 'SELECT name, id FROM user WHERE (name <> NULL)', @@ -544,7 +544,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select('name', 'id').from('user').where('name <> NULL').and('id <> NULL'), pg: { text : 'SELECT name, id FROM user WHERE ((name <> NULL) AND (id <> NULL))', @@ -569,7 +569,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select('name').from('user').where({ name: 'brian' }), @@ -596,7 +596,7 @@ Harness.it({ params: ['brian'] }); -Harness.it({ +Harness.test({ query: user.select('name').from('user').where({ name: 'brian', id: 1 @@ -624,7 +624,7 @@ Harness.it({ params: ['brian', 1] }); -Harness.it({ +Harness.test({ query: user.select(user.name.as('quote"quote"tick`tick`')), pg: { text : 'SELECT "user"."name" AS "quote""quote""tick`tick`" FROM "user"', @@ -649,7 +649,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select(user.star()).where(user.id.in(user.subQuery().select(user.id))), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" IN (SELECT "user"."id" FROM "user"))', diff --git a/test/dialects/ternary-clause-tests.js b/test/dialects/ternary-clause-tests.js index b41873f6..04832fbc 100644 --- a/test/dialects/ternary-clause-tests.js +++ b/test/dialects/ternary-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: customer.select().where(customer.age.between(18, 25)), pg: { text : 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" BETWEEN $1 AND $2)', @@ -29,7 +29,7 @@ Harness.it({ params: [18, 25] }); -Harness.it({ +Harness.test({ query: post.select().where(post.userId.between(customer.subQuery().select(customer.id.min()), customer.subQuery().select(customer.id.max()))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."userId" BETWEEN (SELECT MIN("customer"."id") AS "id_min" FROM "customer") AND (SELECT MAX("customer"."id") AS "id_max" FROM "customer"))', diff --git a/test/dialects/tostring-tests.js b/test/dialects/tostring-tests.js index 6f0363e2..53d413e8 100644 --- a/test/dialects/tostring-tests.js +++ b/test/dialects/tostring-tests.js @@ -5,7 +5,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); // Null -Harness.it({ +Harness.test({ query: post.content.equals(null), pg: { text : '("post"."content" = $1)', @@ -31,7 +31,7 @@ Harness.it({ }); // Number -Harness.it({ +Harness.test({ query: post.content.equals(3.14), pg: { text : '("post"."content" = $1)', @@ -57,7 +57,7 @@ Harness.it({ }); // String -Harness.it({ +Harness.test({ query: post.content.equals('hello\''), pg: { text : '("post"."content" = $1)', @@ -83,7 +83,7 @@ Harness.it({ }); // Array -Harness.it({ +Harness.test({ query: post.content.equals([1, '2', null]), pg: { text : '("post"."content" = ($1, $2, $3))', @@ -109,7 +109,7 @@ Harness.it({ }); // Date -Harness.it({ +Harness.test({ query: post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')), pg: { text : '("post"."content" = $1)', @@ -135,7 +135,7 @@ Harness.it({ }); // Date to milliseconds -Harness.it({ +Harness.test({ query: post.content.equals(new Date('Sat, 01 Jan 2000 00:00:00 GMT')), pg: { text : '("post"."content" = $1)', @@ -170,7 +170,7 @@ var customObject = { } }; -Harness.it({ +Harness.test({ query: post.content.equals(customObject), pg: { text : '("post"."content" = $1)', diff --git a/test/dialects/truncate-table-tests.js b/test/dialects/truncate-table-tests.js index e18b1869..cfdb04da 100644 --- a/test/dialects/truncate-table-tests.js +++ b/test/dialects/truncate-table-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: post.truncate(), pg: { text : 'TRUNCATE TABLE "post"', diff --git a/test/dialects/unary-clause-tests.js b/test/dialects/unary-clause-tests.js index 8e4723c7..875de382 100644 --- a/test/dialects/unary-clause-tests.js +++ b/test/dialects/unary-clause-tests.js @@ -4,7 +4,7 @@ var Harness = require('./support'); var customer = Harness.defineCustomerTable(); var post = Harness.definePostTable(); -Harness.it({ +Harness.test({ query: customer.select().where(customer.age.isNotNull()), pg: { text : 'SELECT "customer".* FROM "customer" WHERE ("customer"."age" IS NOT NULL)', @@ -29,7 +29,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select().where(post.userId. in (customer.subQuery().select(customer.id).where(customer.age.isNull()))), pg: { text : 'SELECT "post".* FROM "post" WHERE ("post"."userId" IN (SELECT "customer"."id" FROM "customer" WHERE ("customer"."age" IS NULL)))', diff --git a/test/dialects/update-tests.js b/test/dialects/update-tests.js index a07e0cf7..eb3d0b3e 100644 --- a/test/dialects/update-tests.js +++ b/test/dialects/update-tests.js @@ -5,7 +5,7 @@ var post = Harness.definePostTable(); var user = Harness.defineUserTable(); var variable = Harness.defineVariableTable(); -Harness.it({ +Harness.test({ query: post.update({ content: 'test' }), @@ -32,7 +32,7 @@ Harness.it({ params: ['test'] }); -Harness.it({ +Harness.test({ query: post.update({ content: 'test', userId: 3 @@ -60,7 +60,7 @@ Harness.it({ params: ['test', 3] }); -Harness.it({ +Harness.test({ query: post.update({ content: null, userId: 3 @@ -88,7 +88,7 @@ Harness.it({ params: [null, 3] }); -Harness.it({ +Harness.test({ query: post.update({ content: 'test', userId: 3 @@ -116,7 +116,7 @@ Harness.it({ params: ['test', 3, 'no'] }); -Harness.it({ +Harness.test({ query: post.update({ content: user.name }).from(user).where(post.userId.equals(user.id)), @@ -144,7 +144,7 @@ Harness.it({ }); // update() needs to prefix ambiguous source columns; prefixing target columns is not allowed -Harness.it({ +Harness.test({ query: post.update({ userId: user.id }).from(user).where(post.userId.equals(user.id)), @@ -172,7 +172,7 @@ Harness.it({ }); // Binary updates -Harness.it({ +Harness.test({ query: post.update({ content: new Buffer('test') }), @@ -196,7 +196,7 @@ Harness.it({ }); // Boolean updates -Harness.it({ +Harness.test({ query: variable.update({ a: true, b: false @@ -221,7 +221,7 @@ Harness.it({ }); // Object updates -Harness.it({ +Harness.test({ query: variable.update({ a: {"id": 1, "value": 2}, b: [{"id": 2, "value": 3}, {"id": 3, "value": 4}] diff --git a/test/dialects/value-expression-tests.js b/test/dialects/value-expression-tests.js index 849712bf..d5c7fcd4 100644 --- a/test/dialects/value-expression-tests.js +++ b/test/dialects/value-expression-tests.js @@ -6,7 +6,7 @@ var post = Harness.definePostTable(); var v = Harness.defineVariableTable(); // Test composition of binary methods +, *, -, =. -Harness.it({ +Harness.test({ query: customer.select(customer.name, customer.income.modulo(100)).where(customer.age.plus(5).multiply(customer.age.minus(2)).equals(10)), pg: { text : 'SELECT "customer"."name", ("customer"."income" % $1) FROM "customer" WHERE ((("customer"."age" + $2) * ("customer"."age" - $3)) = $4)', @@ -32,7 +32,7 @@ Harness.it({ }); // Test composition of binary (e.g. +) and unary (e.g. like) methods. -Harness.it({ +Harness.test({ query: customer.select(customer.name).where(customer.name.like(customer.id.plus('hello'))), pg: { text : 'SELECT "customer"."name" FROM "customer" WHERE ("customer"."name" LIKE ("customer"."id" + $1))', @@ -59,7 +59,7 @@ Harness.it({ // Test implementing simple formulas. // Acceleration formula. (a * t^2 / 2) + (v * t) = d -Harness.it({ +Harness.test({ query: v.select(v.a.multiply(v.a).divide(2).plus(v.v.multiply(v.t)).equals(v.d)), pg: { text : 'SELECT (((("variable"."a" * "variable"."a") / $1) + ("variable"."v" * "variable"."t")) = "variable"."d") FROM "variable"', @@ -85,7 +85,7 @@ Harness.it({ }); // Pythagorean theorem. a^2 + b^2 = c^2. -Harness.it({ +Harness.test({ query: v.select(v.a.multiply(v.a).plus(v.b.multiply(v.b)).equals(v.c.multiply(v.c))), pg: { text : 'SELECT ((("variable"."a" * "variable"."a") + ("variable"."b" * "variable"."b")) = ("variable"."c" * "variable"."c")) FROM "variable"', @@ -110,7 +110,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: post.select(post.id).where(post.content.equals(new Buffer('test'))), pg: { text : 'SELECT "post"."id" FROM "post" WHERE ("post"."content" = $1)', @@ -132,7 +132,7 @@ Harness.it({ }); // concat tests -Harness.it({ +Harness.test({ query: post.select(post.content.concat(post.tags)), pg: { text : 'SELECT ("post"."content" || "post"."tags") FROM "post"', diff --git a/test/dialects/where-clause-tests.js b/test/dialects/where-clause-tests.js index 02be8696..3282b7d9 100644 --- a/test/dialects/where-clause-tests.js +++ b/test/dialects/where-clause-tests.js @@ -3,7 +3,7 @@ var Harness = require('./support'); var user = Harness.defineUserTable(); -Harness.it({ +Harness.test({ query: user.where(user.id.isNotNull(), user.name.isNotNull()), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -28,7 +28,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.and(user.id.isNotNull(), user.name.isNotNull()), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -53,7 +53,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.where([user.id.isNotNull(), user.name.isNotNull()]), pg: { text : 'SELECT * FROM "user" WHERE (("user"."id" IS NOT NULL) AND ("user"."name" IS NOT NULL))', @@ -78,7 +78,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.where([]), pg: { text : 'SELECT * FROM "user" WHERE (1 = 1)', @@ -103,7 +103,7 @@ Harness.it({ params: [] }); -Harness.it({ +Harness.test({ query: user.select().where(user.id.equals(1)).and(user.name.equals('a')), pg: { text : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) AND ("user"."name" = $2))', @@ -128,7 +128,7 @@ Harness.it({ params: [1,'a'] }); -Harness.it({ +Harness.test({ query: user.select().and(user.id.equals(1)), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)', @@ -153,7 +153,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: user.select().or(user.id.equals(1)), pg: { text : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)', @@ -178,7 +178,7 @@ Harness.it({ params: [1] }); -Harness.it({ +Harness.test({ query: user.select().and(user.id.equals(1)).or(user.name.equals('a')), pg: { text : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) OR ("user"."name" = $2))', From 5b299a3f06046676e3a47f8740085138984b8013 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Tue, 14 Jun 2022 10:07:34 -0600 Subject: [PATCH 5/8] brianc/node-sql is stale, so publishing to npm --- README.md | 2 +- package.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e1a3af8c..c17ecde3 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ So let's build it with JavaScript. Maybe it's still not fun, but at least it's _less not fun_. -[![Build Status](https://secure.travis-ci.org/brianc/node-sql.png)](http://travis-ci.org/brianc/node-sql) +[![Build Status](https://app.travis-ci.com/atul898/node-sql.svg)](https://app.travis-ci.com/github/atul898/node-sql) ## install diff --git a/package.json b/package.json index b25af235..b9a6a128 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "author": "brianc ", - "name": "sql", - "description": "sql builder", - "version": "0.78.0", - "homepage": "https://github.com/brianc/node-sql", + "author": "Atul ", + "name": "@stillalive/node-sql", + "description": "sql builder, forked from https://github.com/brianc/node-sql since that package has gone stale, this is forked so we can keep it udpated, so 'npm audit' does not have any issue", + "version": "1.0.0.0", + "homepage": "https://github.com/atul898/node-sql", "license": "MIT", "repository": { "type": "git", - "url": "git://github.com/brianc/node-sql.git" + "url": "git://github.com/atul898/node-sql.git" }, "main": "lib/", "types": "lib/types.d.ts", From 6e8c1291423dd0defa0f85395613c44785d2bc41 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Tue, 14 Jun 2022 10:25:00 -0600 Subject: [PATCH 6/8] Adding a namespace for node-sql is taken --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b9a6a128..21a754e1 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "author": "Atul ", - "name": "@stillalive/node-sql", + "name": "@atul898/node-sql", "description": "sql builder, forked from https://github.com/brianc/node-sql since that package has gone stale, this is forked so we can keep it udpated, so 'npm audit' does not have any issue", - "version": "1.0.0.0", + "version": "1.0.0", "homepage": "https://github.com/atul898/node-sql", "license": "MIT", "repository": { From 46a25cff27db559252604939727e5d325c9174ee Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Tue, 14 Jun 2022 10:35:51 -0600 Subject: [PATCH 7/8] Documentation --- README.md | 4 +--- package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c17ecde3..8436d67e 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,7 @@ _sql string builder for node_ - supports PostgreSQL, mysql, Microsoft SQL Server Building SQL statements by hand is no fun, especially in a language which has clumsy support for multi-line strings. -So let's build it with JavaScript. - -Maybe it's still not fun, but at least it's _less not fun_. +Forked because brianc/node-sql is stale and is not taking pull requests https://github.com/brianc/node-sql/pull/423 and we needed this package working (with out any security vulnerabilities) [![Build Status](https://app.travis-ci.com/atul898/node-sql.svg)](https://app.travis-ci.com/github/atul898/node-sql) diff --git a/package.json b/package.json index 21a754e1..2a5bae72 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Atul ", "name": "@atul898/node-sql", "description": "sql builder, forked from https://github.com/brianc/node-sql since that package has gone stale, this is forked so we can keep it udpated, so 'npm audit' does not have any issue", - "version": "1.0.0", + "version": "1.0.1", "homepage": "https://github.com/atul898/node-sql", "license": "MIT", "repository": { From 64de8ff9f84ce37e42ca4bb6fb5b209610ce5a67 Mon Sep 17 00:00:00 2001 From: Atul Chauhan Date: Tue, 14 Jun 2022 10:38:55 -0600 Subject: [PATCH 8/8] Documentation --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8436d67e..061d4ef3 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ _sql string builder for node_ - supports PostgreSQL, mysql, Microsoft SQL Server Building SQL statements by hand is no fun, especially in a language which has clumsy support for multi-line strings. -Forked because brianc/node-sql is stale and is not taking pull requests https://github.com/brianc/node-sql/pull/423 and we needed this package working (with out any security vulnerabilities) +Forked because we needed this package working (with out any security vulnerabilities), and brianc/node-sql is stale and is not taking pull requests https://github.com/brianc/node-sql/pull/423 [![Build Status](https://app.travis-ci.com/atul898/node-sql.svg)](https://app.travis-ci.com/github/atul898/node-sql) ## install ```sh -$ npm install sql +$ npm install @atul898/node-sql ``` ## use diff --git a/package.json b/package.json index 2a5bae72..fc1295d6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Atul ", "name": "@atul898/node-sql", "description": "sql builder, forked from https://github.com/brianc/node-sql since that package has gone stale, this is forked so we can keep it udpated, so 'npm audit' does not have any issue", - "version": "1.0.1", + "version": "1.0.2", "homepage": "https://github.com/atul898/node-sql", "license": "MIT", "repository": {