added sample queries

This commit is contained in:
Pedro 2014-11-05 16:09:56 +01:00
parent 34da5535fe
commit 6a01ae42a4
2 changed files with 26 additions and 3 deletions

View File

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

View File

@ -21,6 +21,11 @@
</div>
</div>
<!-- Sample Queries -->
<div class="row" style="margin-bottom: 10px;">
<div class="col-sm-12" id="sampleQueries"></div>
</div>
<!-- Input -->
<div class="row">
<div class="col-sm-12">
@ -63,6 +68,12 @@
<script type="text/javascript">
$(function() {
function addSampleQuery(name, query) {
var btn = $('<button type="button" class="btn btn-default">' + name + '</button>');
btn.click(function() { $('#queryInput').val(query); });
$('#sampleQueries').append(btn);
}
function createElement(tag, value) {
return $('<' + tag + '>' + value + '</' + tag + '>');
};
@ -113,8 +124,19 @@ $(function() {
console.log("Query result: ", result);
updateResultTable(result);
updatePerformanceData(result);
}, function(xhr, status, error) {
console.log(arguments);
// On Error
$('#resultTable').html('<td>Error when executing query (' + status + ', ' + xhr.status + ' ' + error + ')</td>');
$('#performanceDataTable tbody').html('');
});
})
});
addSampleQuery('SELECT 1', 'SELECT 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');
});
</script>
</body>