diff --git a/frontend-hyrise/hyrise-sql-connector.js b/frontend-hyrise/hyrise-sql-connector.js index 55ba67e..2e0781e 100644 --- a/frontend-hyrise/hyrise-sql-connector.js +++ b/frontend-hyrise/hyrise-sql-connector.js @@ -28,6 +28,11 @@ HyriseSqlConnector.prototype.executeQuery = function(query, callback, error_call sql: query }, success: function(result) { + if (typeof result.real_size === "undefined") { + result.real_size = 0; + result.rows = []; + result.header = []; + } callback(result); }, error: error_callback diff --git a/frontend-hyrise/index.html b/frontend-hyrise/index.html index 056e71f..13f540a 100644 --- a/frontend-hyrise/index.html +++ b/frontend-hyrise/index.html @@ -23,7 +23,8 @@
-
+
+
@@ -36,7 +37,7 @@
- +
@@ -74,10 +75,15 @@ diff --git a/frontend-hyrise/style.css b/frontend-hyrise/style.css index 1c94a5d..5d7589a 100644 --- a/frontend-hyrise/style.css +++ b/frontend-hyrise/style.css @@ -13,6 +13,11 @@ div { margin-top: 10px; } +button { + margin-left: 1px; + margin-right: 1px; +} + /* #resultTable td { border: 1px solid #333; diff --git a/src/lib/SelectStatement.h b/src/lib/SelectStatement.h index 7d447a7..2ba2a3b 100644 --- a/src/lib/SelectStatement.h +++ b/src/lib/SelectStatement.h @@ -56,9 +56,9 @@ struct SelectStatement : Statement { select_list(NULL), where_clause(NULL), group_by(NULL), + union_select(NULL), order(NULL), - limit(NULL), - union_select(NULL) {}; + limit(NULL) {}; virtual ~SelectStatement(); // defined in destructors.cpp diff --git a/src/parser/bison_parser.y b/src/parser/bison_parser.y index c107ed1..807751d 100644 --- a/src/parser/bison_parser.y +++ b/src/parser/bison_parser.y @@ -244,6 +244,7 @@ select_no_paren: | select_ref UNION select_ref opt_order opt_limit { $$ = $1; $$->union_select = $3; + // TODO: might overwrite order and limit of first select here $$->order = $4; $$->limit = $5; }