sql2json - npm Package Compare versions

Comparing version 1.4.2 to 1.4.3

lib/json2sql.js

@@ -46,2 +46,5 @@ function json2sql() {}
                     break;
+                case 'distinct':
+                    responses.push(`DISTINCT ${parseSelect(node.arguments)}`);
+                    break;
                 default:
@@ -48,0 +51,0 @@ break;

lib/sql2json.js

@@ -114,2 +114,3 @@ const lexer = require('sql-parser').lexer;
     let containAs = false;
+    let isDistinct = false;
     while (this.hasNext()) {
@@ -149,2 +150,5 @@ const token = this.next();
                 break;
+            case 'DISTINCT':
+                isDistinct = true;
+                break;
             case 'SEPARATOR':
@@ -154,2 +158,8 @@ break;
                 this.index--;
+                if (isDistinct) {
+                    this.parsed.select = [{
+                        type: 'distinct',
+                        arguments: this.parsed.select
+                    }];
+                }
                 return;
@@ -156,0 +166,0 @@

package.json

 {
   "name": "sql2json",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

test/json2sql.js

@@ -277,2 +277,40 @@ const assert = require('assert');
         });
+
+        it('SQL with distinct', () => {
+            const data = {
+                select: [{
+                    type: 'distinct',
+                    arguments: [{
+                        value: 'countries',
+                        type: 'literal',
+                        alias: null
+                    }]
+                }],
+                from: 'tablename'
+            };
+
+            const response = 'SELECT DISTINCT countries FROM tablename';
+            Json2sql.toSQL(data).should.deepEqual(response);
+        });
+
+        it('SQL with distinct with several files', () => {
+            const data = {
+                select: [{
+                    type: 'distinct',
+                    arguments: [{
+                        value: 'countries',
+                        type: 'literal',
+                        alias: null
+                    }, {
+                        value: 'cities',
+                        type: 'literal',
+                        alias: null
+                    }]
+                }],
+                from: 'tablename'
+            };
+
+            const response = 'SELECT DISTINCT countries, cities FROM tablename';
+            Json2sql.toSQL(data).should.deepEqual(response);
+        });
     });
@@ -279,0 +317,0 @@ describe('OrderBy', () => {

test/sql2json.js

@@ -295,2 +295,42 @@ const assert = require('assert');
 
+        it('SQL with distinct', () => {
+            const response = {
+                select: [{
+                    type: 'distinct',
+                    arguments: [{
+                        value: 'countries',
+                        type: 'literal',
+                        alias: null
+                    }]
+                }],
+                from: 'tablename'
+            };
+
+            const obj = new Sql2json('select distinct countries from tablename');
+            const json = obj.toJSON();
+            json.should.deepEqual(response);
+        });
+
+        it('SQL with distinct with several files', () => {
+            const response = {
+                select: [{
+                    type: 'distinct',
+                    arguments: [{
+                        value: 'countries',
+                        type: 'literal',
+                        alias: null
+                    }, {
+                        value: 'cities',
+                        type: 'literal',
+                        alias: null
+                    }]
+                }],
+                from: 'tablename'
+            };
+
+            const obj = new Sql2json('select distinct countries, cities from tablename');
+            const json = obj.toJSON();
+            json.should.deepEqual(response);
+        });
+
     });
@@ -297,0 +337,0 @@

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

87025

increased by3.56%

Lines of code

2480

increased by3.46%

No dependency changes