DBIS
/
HyriseSQLParser
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor changes

This commit is contained in:
Pedro 2014-11-10 23:32:27 +01:00
parent e25aedd00e
commit c6ae1c8427
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend-hyrise/hyrise-sql-connector.js
View File

@ -14,6 +14,7 @@ HyriseSqlConnector.prototype.setConnectionDetails = function(host, port) {
return this; return this;
}; };
HyriseSqlConnector.prototype.executeQuery = function(query, callback, error_callback) { HyriseSqlConnector.prototype.executeQuery = function(query, callback, error_callback) {
var endpoint = 'http://' + this._host + ':' + this._port + '/query'; var endpoint = 'http://' + this._host + ':' + this._port + '/query';
var url = encodeURI(endpoint); var url = encodeURI(endpoint);

16
frontend-hyrise/index.html
View File

@ -43,6 +43,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<!-- View: Performance Data --> <!-- View: Performance Data -->
<h3>Performance Data</h3>
<table id="performanceDataTable" class="table table-bordered table-striped table-hover"> <table id="performanceDataTable" class="table table-bordered table-striped table-hover">
<thead> <thead>
<tr> <tr>
@ -61,6 +62,7 @@
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<!-- View: Result Table --> <!-- View: Result Table -->
<h3>Results (first 100 rows)</h3>
<table id="resultTable" class="table table-bordered table-striped table-hover"></table> <table id="resultTable" class="table table-bordered table-striped table-hover"></table>
</div> </div>
</div> </div>
@ -126,14 +128,22 @@ $(function() {
updatePerformanceData(result); updatePerformanceData(result);
}, function(xhr, status, error) { }, function(xhr, status, error) {
console.log(arguments); console.log(arguments);
var msg = xhr.responseJSON.error[0];
// On Error // 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(''); $('#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('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('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'); addSampleQuery('JOIN', 'SELECT * FROM students t1 JOIN students t2 ON t1.student_number = t2.student_number');

8
src/lib/Expr.cpp
View File

@ -86,10 +86,10 @@ Expr* Expr::makeFunctionRef(char* func_name, Expr* expr) {
} }
Expr::~Expr() { Expr::~Expr() {
delete expr; // delete expr;
delete expr2; // delete expr2;
delete name; // delete name;
delete table; // delete table;
} }
} // namespace hsql } // namespace hsql