From c6ae1c8427af4b4e4bd7f9374d5ad483f73a64de Mon Sep 17 00:00:00 2001
From: Pedro <pedroflemming@gmail.com>
Date: Mon, 10 Nov 2014 23:32:27 +0100
Subject: [PATCH] minor changes

---
 frontend-hyrise/hyrise-sql-connector.js |  1 +
 frontend-hyrise/index.html              | 16 +++++++++++++---
 src/lib/Expr.cpp                        |  8 ++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend-hyrise/hyrise-sql-connector.js b/frontend-hyrise/hyrise-sql-connector.js
index f63e917..55ba67e 100644
--- a/frontend-hyrise/hyrise-sql-connector.js
+++ b/frontend-hyrise/hyrise-sql-connector.js
@@ -14,6 +14,7 @@ HyriseSqlConnector.prototype.setConnectionDetails = function(host, port) {
 	return this;
 };
 
+
 HyriseSqlConnector.prototype.executeQuery = function(query, callback, error_callback) {
 	var endpoint = 'http://' + this._host + ':' + this._port + '/query';
 	var url = encodeURI(endpoint);
diff --git a/frontend-hyrise/index.html b/frontend-hyrise/index.html
index 931a293..55752c2 100644
--- a/frontend-hyrise/index.html
+++ b/frontend-hyrise/index.html
@@ -43,6 +43,7 @@
           <div class="row">
             <div class="col-sm-12">
               <!-- View: Performance Data -->
+              <h3>Performance Data</h3>
               <table id="performanceDataTable" class="table table-bordered table-striped table-hover">
                 <thead>
                   <tr>
@@ -61,6 +62,7 @@
         </div>
         <div class="col-lg-6">
           <!-- View: Result Table -->
+          <h3>Results (first 100 rows)</h3>
           <table id="resultTable" class="table table-bordered table-striped table-hover"></table>
         </div>
       </div>
@@ -126,14 +128,22 @@ $(function() {
       updatePerformanceData(result);
     }, function(xhr, status, error) {
       console.log(arguments);
+      var msg = xhr.responseJSON.error[0];
       // On Error
-      $('#resultTable').html('<td>Error when executing query (' + status + ', ' + xhr.status + ' ' + error + ')</td>');
+      $('#resultTable').html('<td>Error when executing query (' + status + ', ' + msg + ')</td>');
       $('#performanceDataTable tbody').html('');
-
     });
   });
 
-  addSampleQuery('SELECT 1', 'SELECT name, city, grade FROM students WHERE grade <= 2.0;')
+  $('#queryInput').keypress(function(evt) {
+    if (evt.keyCode == 13 && evt.shiftKey) {
+      $('#submitBtn').click();
+      return false;
+    }
+    return true;
+  });
+
+  addSampleQuery('IMPORT & SELECT', 'IMPORT FROM TBL FILE \'test/students.tbl\' INTO students;\nSELECT name, city, grade FROM students WHERE grade <= 2.0;')
   addSampleQuery('SELECT 2', 'SELECT name, city, grade FROM (SELECT * FROM students WHERE city = \'Potsdam\') t1 WHERE grade <= 1.5 OR grade >= 3.5;');
   addSampleQuery('COMMENT & LIKE', '-- test\nSELECT * FROM students WHERE city LIKE \'B.*\'\n-- comment');
   addSampleQuery('JOIN', 'SELECT * FROM students t1 JOIN students t2 ON t1.student_number = t2.student_number');
diff --git a/src/lib/Expr.cpp b/src/lib/Expr.cpp
index 1aceca9..8110afb 100644
--- a/src/lib/Expr.cpp
+++ b/src/lib/Expr.cpp
@@ -86,10 +86,10 @@ Expr* Expr::makeFunctionRef(char* func_name, Expr* expr) {
 }
 
 Expr::~Expr() {
-	delete expr;
-	delete expr2;
-	delete name;
-	delete table;
+	// delete expr;
+	// delete expr2;
+	// delete name;
+	// delete table;
 }
 
 } // namespace hsql
\ No newline at end of file