beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Improve enum parsing

Browse source
This commit is contained in:
Jakub Vrana 2018-05-06 19:14:54 +02:00
parent 11f24a52e4
commit 659c34f7c5
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
adminer/static/editing.js
View file

@ -395,8 +395,7 @@ function editingLengthFocus() {
var td = this.parentNode;
if (/(enum|set)$/.test(selectValue(td.previousSibling.firstChild))) {
var edit = qs('#enum-edit');
var val = this.value;
edit.value = (/^'.+'$/.test(val) ? val.substr(1, val.length - 2).replace(/','/g, "\n").replace(/''/g, "'") : val); //! doesn't handle 'a'',''b' correctly
edit.value = enumValues(this.value);
td.appendChild(edit);
this.style.display = 'none';
edit.style.display = 'inline';
@ -404,6 +403,25 @@ function editingLengthFocus() {
}
}
/** Get enum values
* @param string
* @return string values separated by newlines
*/
function enumValues(s) {
var re = /(^|,)\s*'(([^\\']|\\.|'')*)'\s*/g;
var result = [];
var offset = 0;
var match;
while (match = re.exec(s)) {
if (offset != match.index) {
break;
}
result.push(match[2].replace(/'(')|\\(.)/g, '$1$2'));
offset += match[0].length;
}
return (offset == s.length ? result.join('\n') : s);
}
/** Finish editing of enum or set
* @this HTMLTextAreaElement
*/