sql - npm Package Compare versions

Comparing version 0.44.0 to 0.45.0

lib/node/query.js

@@ -145,2 +145,3 @@ 'use strict';
   or: function(node) {
+    if (!this.whereClause) return this.where(node);
     this.whereClause.or(node);
@@ -151,2 +152,3 @@ return this;
   and: function(node) {
+    if (!this.whereClause) return this.where(node);
     this.whereClause.and(node);
@@ -153,0 +155,0 @@ return this;

package.json

@@ -5,3 +5,3 @@ {
   "description": "sql builder",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "homepage": "https://github.com/brianc/node-sql",
@@ -8,0 +8,0 @@ "repository": {

test/dialects/where-clause-tests.js

@@ -62,2 +62,6 @@ 'use strict';
   },
+  mssql: {
+    text  : 'SELECT * FROM [user] WHERE (([user].[id] IS NOT NULL) AND ([user].[name] IS NOT NULL))',
+    string: 'SELECT * FROM [user] WHERE (([user].[id] IS NOT NULL) AND ([user].[name] IS NOT NULL))'
+  },
   params: []
@@ -80,3 +84,92 @@ });
   },
+  mssql: {
+    text  : 'SELECT * FROM [user] WHERE (1 = 1)',
+    string: 'SELECT * FROM [user] WHERE (1 = 1)'
+  },
   params: []
-});
+});
+
+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))',
+    string: 'SELECT "user".* FROM "user" WHERE (("user"."id" = 1) AND ("user"."name" = \'a\'))'
+  },
+  mysql: {
+    text  : 'SELECT `user`.* FROM `user` WHERE ((`user`.`id` = ?) AND (`user`.`name` = ?))',
+    string: 'SELECT `user`.* FROM `user` WHERE ((`user`.`id` = 1) AND (`user`.`name` = \'a\'))'
+  },
+  sqlite: {
+    text  : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) AND ("user"."name" = $2))',
+    string: 'SELECT "user".* FROM "user" WHERE (("user"."id" = 1) AND ("user"."name" = \'a\'))'
+  },
+  mssql: {
+    text  : 'SELECT [user].* FROM [user] WHERE (([user].[id] = @1) AND ([user].[name] = @2))',
+    string: 'SELECT [user].* FROM [user] WHERE (([user].[id] = 1) AND ([user].[name] = \'a\'))'
+  },
+  params: [1,'a']
+});
+
+Harness.test({
+  query: user.select().and(user.id.equals(1)),
+  pg: {
+    text  : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)',
+    string: 'SELECT "user".* FROM "user" WHERE ("user"."id" = 1)'
+  },
+  mysql: {
+    text  : 'SELECT `user`.* FROM `user` WHERE (`user`.`id` = ?)',
+    string: 'SELECT `user`.* FROM `user` WHERE (`user`.`id` = 1)'
+  },
+  sqlite: {
+    text  : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)',
+    string: 'SELECT "user".* FROM "user" WHERE ("user"."id" = 1)'
+  },
+  mssql: {
+    text  : 'SELECT [user].* FROM [user] WHERE ([user].[id] = @1)',
+    string: 'SELECT [user].* FROM [user] WHERE ([user].[id] = 1)'
+  },
+  params: [1]
+});
+
+Harness.test({
+  query: user.select().or(user.id.equals(1)),
+  pg: {
+    text  : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)',
+    string: 'SELECT "user".* FROM "user" WHERE ("user"."id" = 1)'
+  },
+  mysql: {
+    text  : 'SELECT `user`.* FROM `user` WHERE (`user`.`id` = ?)',
+    string: 'SELECT `user`.* FROM `user` WHERE (`user`.`id` = 1)'
+  },
+  sqlite: {
+    text  : 'SELECT "user".* FROM "user" WHERE ("user"."id" = $1)',
+    string: 'SELECT "user".* FROM "user" WHERE ("user"."id" = 1)'
+  },
+  mssql: {
+    text  : 'SELECT [user].* FROM [user] WHERE ([user].[id] = @1)',
+    string: 'SELECT [user].* FROM [user] WHERE ([user].[id] = 1)'
+  },
+  params: [1]
+});
+
+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))',
+    string: 'SELECT "user".* FROM "user" WHERE (("user"."id" = 1) OR ("user"."name" = \'a\'))'
+  },
+  mysql: {
+    text  : 'SELECT `user`.* FROM `user` WHERE ((`user`.`id` = ?) OR (`user`.`name` = ?))',
+    string: 'SELECT `user`.* FROM `user` WHERE ((`user`.`id` = 1) OR (`user`.`name` = \'a\'))'
+  },
+  sqlite: {
+    text  : 'SELECT "user".* FROM "user" WHERE (("user"."id" = $1) OR ("user"."name" = $2))',
+    string: 'SELECT "user".* FROM "user" WHERE (("user"."id" = 1) OR ("user"."name" = \'a\'))'
+  },
+  mssql: {
+    text  : 'SELECT [user].* FROM [user] WHERE (([user].[id] = @1) OR ([user].[name] = @2))',
+    string: 'SELECT [user].* FROM [user] WHERE (([user].[id] = 1) OR ([user].[name] = \'a\'))'
+  },
+  params: [1,'a']
+});
+

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

346129

increased by1.07%

Lines of code

9087

increased by1.01%

No dependency changes