gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gsoc-db-designer'

Browse Source
This commit is contained in:
Maurício Meneghini Fauth 2019-07-12 02:47:10 -03:00
commit d570c50c3e
2 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
js/designer/history.js
View File

@ -89,7 +89,8 @@ DesignerHistory.display = function (init, finit) {
}
// this part generates HTML code for history tab.adds delete,edit,and/or and detail features with objects.
str = ''; // string to store Html code for history tab
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
temp = historyArray[i].getTab(); // + '.' + historyArray[i].getObjNo(); for Self JOIN
str += '<h3 class="tiger"><a href="#">' + temp + '</a></h3>';
str += '<div class="toggle_container">\n';
@ -115,7 +116,7 @@ DesignerHistory.display = function (init, finit) {
}
str += '</tr></thead>';
i++;
if (i >= historyArray.length) {
if (i >= historyArrayLength) {
break;
}
str += '</table></div>';
@ -153,7 +154,8 @@ DesignerHistory.andOr = function (index) {
**/
DesignerHistory.historyDelete = function (index) {
for (var k = 0; k < fromArray.length; k++) {
var fromArrayLength = fromArray.length;
for (var k = 0; k < fromArrayLength; k++) {
if (fromArray[k] === historyArray[index].getTab()) {
fromArray.splice(k, 1);
break;
@ -449,12 +451,13 @@ DesignerHistory.unique = function (arrayName) {
var newArray = [];
uniquetop:
for (var i = 0; i < arrayName.length; i++) {
for (var j = 0; j < newArray.length; j++) {
var newArrayLength = newArray.length;
for (var j = 0; j < newArrayLength; j++) {
if (newArray[j] === arrayName[i]) {
continue uniquetop;
}
}
newArray[newArray.length] = arrayName[i];
newArray[newArrayLength] = arrayName[i];
}
return newArray;
};
@ -468,7 +471,8 @@ DesignerHistory.unique = function (arrayName) {
*/
DesignerHistory.found = function (arrayName, value) {
for (var i = 0; i < arrayName.length; i++) {
var arrayNameLength = arrayName.length;
for (var i = 0; i < arrayNameLength; i++) {
if (arrayName[i] === value) {
return 1;
}
@ -483,7 +487,8 @@ DesignerHistory.found = function (arrayName, value) {
* @params arr array in which elements are added
*/
DesignerHistory.addArray = function (add, arr) {
for (var i = 0; i < add.length; i++) {
var addLength = add.length;
for (var i = 0; i < addLength; i++) {
arr.push(add[i]);
}
return arr;
@ -497,8 +502,10 @@ DesignerHistory.addArray = function (add, arr) {
*
*/
DesignerHistory.removeArray = function (rem, arr) {
for (var i = 0; i < rem.length; i++) {
for (var j = 0; j < arr.length; j++) {
var remLength = rem.length;
for (var i = 0; i < remLength; i++) {
var arrLength = arr.length;
for (var j = 0; j < arrLength; j++) {
if (rem[i] === arr[j]) {
arr.splice(j, 1);
}
@ -515,7 +522,8 @@ DesignerHistory.removeArray = function (rem, arr) {
DesignerHistory.queryGroupBy = function () {
var i;
var str = '';
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
if (historyArray[i].getType() === 'GroupBy') {
str += '`' + historyArray[i].getColumnName() + '`, ';
}
@ -532,7 +540,8 @@ DesignerHistory.queryGroupBy = function () {
DesignerHistory.queryHaving = function () {
var i;
var and = '(';
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
if (historyArray[i].getType() === 'Having') {
if (historyArray[i].getObj().getOperator() !== 'None') {
and += historyArray[i].getObj().getOperator() + '(`' + historyArray[i].getColumnName() + '`) ' + historyArray[i].getObj().getRelationOperator();
@ -559,7 +568,8 @@ DesignerHistory.queryHaving = function () {
DesignerHistory.queryOrderBy = function () {
var i;
var str = '';
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
if (historyArray[i].getType() === 'OrderBy') {
str += '`' + historyArray[i].getColumnName() + '` ' +
historyArray[i].getObj().getOrder() + ', ';
@ -579,7 +589,8 @@ DesignerHistory.queryWhere = function () {
var i;
var and = '(';
var or = '(';
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
if (historyArray[i].getType() === 'Where') {
if (historyArray[i].getAndOr() === 0) {
and += '( `' + historyArray[i].getColumnName() + '` ' + historyArray[i].getObj().getRelationOperator() + ' ' + historyArray[i].getObj().getQuery() + ')';
@ -608,7 +619,8 @@ DesignerHistory.queryWhere = function () {
DesignerHistory.checkAggregate = function (idThis) {
var i;
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
var temp = '`' + historyArray[i].getTab() + '`.`' + historyArray[i].getColumnName() + '`';
if (temp === idThis && historyArray[i].getType() === 'Aggregate') {
return historyArray[i].getObj().getOperator() + '(' + idThis + ')';
@ -619,7 +631,8 @@ DesignerHistory.checkAggregate = function (idThis) {
DesignerHistory.checkRename = function (idThis) {
var i;
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
var temp = '`' + historyArray[i].getTab() + '`.`' + historyArray[i].getColumnName() + '`';
if (temp === idThis && historyArray[i].getType() === 'Rename') {
return ' AS `' + historyArray[i].getObj().getRenameTo() + '`';
@ -655,7 +668,8 @@ DesignerHistory.queryFrom = function () {
// the constraints that have been used in the LEFT JOIN
var constraintsAdded = [];
for (i = 0; i < historyArray.length; i++) {
var historyArrayLength = historyArray.length;
for (i = 0; i < historyArrayLength; i++) {
fromArray.push(historyArray[i].getTab());
}
fromArray = DesignerHistory.unique(fromArray);
@ -749,8 +763,9 @@ DesignerHistory.queryFrom = function () {
DesignerHistory.buildQuery = function () {
var qSelect = 'SELECT ';
var temp;
if (selectField.length > 0) {
for (var i = 0; i < selectField.length; i++) {
var selectFieldLength = selectField.length;
if (selectFieldLength > 0) {
for (var i = 0; i < selectFieldLength; i++) {
temp = DesignerHistory.checkAggregate(selectField[i]);
if (temp !== '') {
qSelect += temp;

8
js/designer/init.js
View File

@ -54,15 +54,15 @@ AJAX.registerOnload('designer/init.js', function () {
}
$('#query_Aggregate_Button').on('click', function () {
document.getElementById('query_Aggregate').style.display = 'none';
$('#query_Aggregate').style.display = 'none';
});
$('#query_having_button').on('click', function () {
document.getElementById('query_having').style.display = 'none';
$('#query_having').style.display = 'none';
});
$('#query_rename_to_button').on('click', function () {
document.getElementById('query_rename_to').style.display = 'none';
$('#query_rename_to').style.display = 'none';
});
$('#build_query_button').on('click', function () {
@ -70,6 +70,6 @@ AJAX.registerOnload('designer/init.js', function () {
});
$('#query_where_button').on('click', function () {
document.getElementById('query_where').style.display = 'none';
$('#query_where').style.display = 'none';
});
});