Sven Klemm пре 7 година
родитељ
комит
aa830211fe

+ 1 - 5
public/app/plugins/datasource/postgres/postgres_query.ts

@@ -151,11 +151,7 @@ export default class PostgresQuery {
           if (func === 'first' || func === 'last') {
             query = func + '(' + query + ',' + this.target.timeColumn + ')';
           } else {
-            if (windows) {
-              query = func + '(' + query + ' ORDER BY ' + this.target.timeColumn + ')';
-            } else {
-              query = func + '(' + query + ')';
-            }
+            query = func + '(' + query + ')';
           }
           break;
         case 'percentile':

+ 2 - 2
public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts

@@ -98,8 +98,8 @@ describe('PostgresQuery', function() {
       { type: 'window', params: ['increase'] },
     ];
     expect(query.buildValueColumn(column)).toBe(
-      '(CASE WHEN max(v ORDER BY time) >= lag(max(v ORDER BY time)) OVER (PARTITION BY host ORDER BY time) ' +
-        'THEN max(v ORDER BY time) - lag(max(v ORDER BY time)) OVER (PARTITION BY host ORDER BY time) ELSE max(v ORDER BY time) END) AS "a"'
+      '(CASE WHEN max(v) >= lag(max(v)) OVER (PARTITION BY host ORDER BY time) ' +
+        'THEN max(v) - lag(max(v)) OVER (PARTITION BY host ORDER BY time) ELSE max(v) END) AS "a"'
     );
   });