Correct OFFSET (fix AlaSQL#858)

vaishunb · Apr 6, 2017 · c15912d · c15912d
1 parent 7b6a47c
commit c15912d
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 23 deletions.
diff --git a/dist/alasql-worker.js b/dist/alasql-worker.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.9-develop-1512 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.9-develop-1513 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.9-develop-1512
+@version 0.3.9-develop-1513
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff

diff --git a/dist/alasql-worker.min.js b/dist/alasql-worker.min.js
diff --git a/dist/alasql.d.ts b/dist/alasql.d.ts
@@ -71,6 +71,7 @@ declare namespace alaSQLSpace {
         fn: userDefinedFunctionLookUp;
         aggr: userAggregatorLookUp;
         autoval(tablename: string, colname: string, getNext?:boolean): number;
+        yy:{};
     }
 }
 

diff --git a/dist/alasql.fs.js b/dist/alasql.fs.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.9-develop-1512 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.9-develop-1513 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.9-develop-1512
+@version 0.3.9-develop-1513
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -137,7 +137,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.3.9-develop-1512';
+alasql.version = '0.3.9-develop-1513';
 
 /**
 	Debug flag
@@ -6646,10 +6646,13 @@ function doLimit (query) {
 
 	if(query.limit) {
 		var offset = 0;
-		if(query.offset) offset = ((query.offset|0)-1)||0;
+		if(query.offset){
+			offset = (query.offset|0)||0;
+			offset = offset<0 ? 0 : offset;
+		}
 		var limit;
 		if(query.percent) {
-			limit = ((query.data.length*query.limit/100)| 0)+offset;			
+			limit = ((query.data.length*query.limit/100)|0)+offset;			
 		} else {
 			limit = (query.limit|0) + offset;
 		}

diff --git a/dist/alasql.js b/dist/alasql.js
@@ -1,7 +1,7 @@
-//! AlaSQL v0.3.9-develop-1512 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
+//! AlaSQL v0.3.9-develop-1513 | © 2014-2016 Andrey Gershun & Mathias Rangel Wulff | License: MIT 
 /*
 @module alasql
-@version 0.3.9-develop-1512
+@version 0.3.9-develop-1513
 
 AlaSQL - JavaScript SQL database
 © 2014-2016	Andrey Gershun & Mathias Rangel Wulff
@@ -137,7 +137,7 @@ var alasql = function(sql, params, cb, scope) {
 	Current version of alasql 
  	@constant {string} 
 */
-alasql.version = '0.3.9-develop-1512';
+alasql.version = '0.3.9-develop-1513';
 
 /**
 	Debug flag
@@ -6646,10 +6646,13 @@ function doLimit (query) {
 
 	if(query.limit) {
 		var offset = 0;
-		if(query.offset) offset = ((query.offset|0)-1)||0;
+		if(query.offset){
+			offset = (query.offset|0)||0;
+			offset = offset<0 ? 0 : offset;
+		}
 		var limit;
 		if(query.percent) {
-			limit = ((query.data.length*query.limit/100)| 0)+offset;			
+			limit = ((query.data.length*query.limit/100)|0)+offset;			
 		} else {
 			limit = (query.limit|0) + offset;
 		}

diff --git a/dist/alasql.min.js b/dist/alasql.min.js
diff --git a/src/38query.js b/src/38query.js
@@ -424,10 +424,13 @@ function doLimit (query) {
 //	console.log(query.limit, query.offset)
 	if(query.limit) {
 		var offset = 0;
-		if(query.offset) offset = ((query.offset|0)-1)||0;
+		if(query.offset){
+			offset = (query.offset|0)||0;
+			offset = offset<0 ? 0 : offset;
+		}
 		var limit;
 		if(query.percent) {
-			limit = ((query.data.length*query.limit/100)| 0)+offset;			
+			limit = ((query.data.length*query.limit/100)|0)+offset;			
 		} else {
 			limit = (query.limit|0) + offset;
 		}

diff --git a/test/test030.js b/test/test030.js
@@ -25,7 +25,7 @@ describe('Test 30', function() {
 
 		var sql = 'SELECT COLUMN a FROM test1 LIMIT 3 OFFSET 2';
 		var res = db.exec(sql);
-		assert.deepEqual([ 2,3,4 ], res);
+		assert.deepEqual([ 3,4,5 ], res);
 
 		done();
 	});

diff --git a/test/test035.js b/test/test035.js
@@ -25,7 +25,7 @@ describe('Test 35 - LIMIT OFFSET', function() {
 
 		var sql = 'SELECT COLUMN a FROM test1 LIMIT 3 OFFSET 2';
 		var res = db.exec(sql);
-		assert.deepEqual([ 2,3,4 ], res);
+		assert.deepEqual([ 3,4,5 ], res);
 
 		done();
 	});
@@ -49,7 +49,7 @@ describe('Test 35 - LIMIT OFFSET', function() {
 
 		var sql = 'SELECT COLUMN a FROM test1 LIMIT 5 OFFSET 2';
 		var res = alasql(sql);
-		assert.deepEqual([ 2,3,4,5,6 ], res);
+		assert.deepEqual([ 3,4,5,6,7 ], res);
 
 		alasql('drop database test35');
 		done();

diff --git a/test/test368.js b/test/test368.js
@@ -25,16 +25,16 @@ describe('Test 368 OFFSET ... LIMIT', function() {
 
      it('OFFSET LIMIT',function(done){
      	var res = alasql('SELECT * FROM ? LIMIT 2 OFFSET 3',[data]);
-     	assert.deepEqual(res,[ { a: 3 }, { a: 4 } ]);
+     	assert.deepEqual(res,[ { a: 4 }, { a: 5 } ]);
      	done();
      });
 
      it('OFFSET FETCH',function(done){
      	var res = alasql('SELECT * FROM ? OFFSET 3 FETCH 2',[data]);
-     	assert.deepEqual(res,[ { a: 3 }, { a: 4 } ]);
+     	assert.deepEqual(res,[ { a: 4 }, { a: 5 } ]);
 
      	var res = alasql('SELECT * FROM ? OFFSET 3 ROWS FETCH NEXT 2 ROWS ONLY',[data]);
-     	assert.deepEqual(res,[ { a: 3 }, { a: 4 } ]);
+     	assert.deepEqual(res,[ { a: 4 }, { a: 5 } ]);
      	done();
      });
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ declare namespace alaSQLSpace { @@
             fn: userDefinedFunctionLookUp;
             aggr: userAggregatorLookUp;
             autoval(tablename: string, colname: string, getNext?:boolean): number;
+            yy:{};
         }
     }
@@ Expand Down @@