changeset 67429bcbe92e in sao:default
details: https://hg.tryton.org/sao?cmd=changeset&node=67429bcbe92e
description:
Use '\' as escape char for wildcard
issue10626
review349031002
diffstat:
src/common.js | 40 ++++++++++++++++++++++++++++++++++------
tests/sao.js | 2 +-
2 files changed, 35 insertions(+), 7 deletions(-)
diffs (82 lines):
diff -r d98bc405f011 -r 67429bcbe92e src/common.js
--- a/src/common.js Wed Aug 11 18:02:25 2021 +0200
+++ b/src/common.js Thu Aug 12 18:39:50 2021 +0200
@@ -1214,8 +1214,7 @@
name = name.slice(0, -9);
}
if (!(name in this.fields)) {
- escaped = value.replace('%%', '__');
- if (escaped.startsWith('%') && escaped.endsWith('%')) {
+ if (this.is_full_text(value)) {
value = value.slice(1, -1);
}
return this.quote(value);
@@ -1226,16 +1225,15 @@
target = clause[3];
}
if (operator.contains('ilike')) {
- escaped = value.replace('%%', '__');
- if (escaped.startsWith('%') && escaped.endsWith('%')) {
+ if (this.is_full_text(value)) {
value = value.slice(1, -1);
- } else if (!escaped.contains('%')) {
+ } else if (!this.is_like(value)) {
if (operator == 'ilike') {
operator = '=';
} else {
operator = '!';
}
- value = value.replace('%%', '%');
+ value = this.unescape(value);
}
}
var def_operator = this.default_operator(field);
@@ -1871,6 +1869,36 @@
return '%' + value + '%';
}
},
+ is_full_text: function(value, escape) {
+ escape = escape || '\\';
+ var escaped = value;
+ while (escaped.charAt(0) == '%') {
+ escaped = escaped.substring(1);
+ }
+ while (escaped.charAt(escaped.length - 1) == '%') {
+ escaped = escaped.substring(0, escaped.length - 1);
+ }
+ escaped = escaped
+ .replace(escape + '%', '')
+ .replace(escape + '_', '');
+ if (escaped.contains('%') || escaped.contains('_')) {
+ return false;
+ }
+ return value.startsWith('%') && value.endsWith('%');
+ },
+ is_like: function(value, escape) {
+ escape = escape || '\\';
+ var escaped = value
+ .replace(escape + '%', '')
+ .replace(escape + '_', '');
+ return escaped.contains('%') || escaped.contains('_');
+ },
+ unescape: function(value, escape) {
+ escape = escape || '\\';
+ return value
+ .replace(escape + '%', '%')
+ .replace(escape + '_', '_');
+ },
quote: function(value) {
if (typeof value != 'string') {
return value;
diff -r d98bc405f011 -r 67429bcbe92e tests/sao.js
--- a/tests/sao.js Wed Aug 11 18:02:25 2021 +0200
+++ b/tests/sao.js Thu Aug 12 18:39:50 2021 +0200
@@ -2143,7 +2143,7 @@
[[['name', 'ilike', '%<%']], 'Name: "" "<"'],
[[['name', 'ilike', 'Doe']], 'Name: =Doe'],
[[['name', 'ilike', 'Doe%']], 'Name: Doe%'],
- [[['name', 'ilike', 'Doe%%']], 'Name: =Doe%'],
+ [[['name', 'ilike', 'Doe\\%']], 'Name: =Doe%'],
[[['name', 'not ilike', '%Doe%']], 'Name: !Doe'],
[[['name', 'in', ['John', 'Jane']]], 'Name: John;Jane'],
[[['name', 'not in', ['John', 'Jane']]], 'Name: !John;Jane'],