sort by key in $columns macros

Altinity · Nov 17, 2017 · e40e2b2 · e40e2b2
1 parent 8ce6c69
commit e40e2b2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/dist/clickhouse-info.js b/dist/clickhouse-info.js
diff --git a/dist/clickhouse-info.js.map b/dist/clickhouse-info.js.map
diff --git a/dist/sql_query.js b/dist/sql_query.js
diff --git a/dist/sql_query.js.map b/dist/sql_query.js.map
diff --git a/dist/sql_query.ts b/dist/sql_query.ts
@@ -41,7 +41,7 @@ export default class SqlQuery {
                 query = SqlQuery.rate(query, ast);
             }
         } catch (err) {
-            console.log("Parse error: ", err);
+            throw {message: 'AST parser error: ' + err.message};
         }
 
         query = this.templateSrv.replace(query, options.scopedVars, SqlQuery.interpolateQueryExpr);
@@ -105,7 +105,7 @@ export default class SqlQuery {
                 fromQuery +
                 ' GROUP BY t, ' + keyAlias +
                 ' ' + having +
-                ' ORDER BY t' +
+                ' ORDER BY t, ' + keyAlias +
                 ') ' +
             'GROUP BY t ' +
             'ORDER BY t';

diff --git a/src/sql_query.ts b/src/sql_query.ts
@@ -41,7 +41,7 @@ export default class SqlQuery {
                 query = SqlQuery.rate(query, ast);
             }
         } catch (err) {
-            console.log("Parse error: ", err);
+            throw {message: 'AST parser error: ' + err.message};
         }
 
         query = this.templateSrv.replace(query, options.scopedVars, SqlQuery.interpolateQueryExpr);
@@ -105,7 +105,7 @@ export default class SqlQuery {
                 fromQuery +
                 ' GROUP BY t, ' + keyAlias +
                 ' ' + having +
-                ' ORDER BY t' +
+                ' ORDER BY t, ' + keyAlias +
                 ') ' +
             'GROUP BY t ' +
             'ORDER BY t';