* remove derby and fyracle from trunk
This commit is contained in:
parent
b55bb9f8ec
commit
7b42e73c7a
|
@ -571,42 +571,29 @@ public final class Find extends CDialog
|
||||||
m_query = new MQuery(m_tableName);
|
m_query = new MQuery(m_tableName);
|
||||||
if (hasValue && !valueField.getText().equals("%") && valueField.getText().length() != 0)
|
if (hasValue && !valueField.getText().equals("%") && valueField.getText().length() != 0)
|
||||||
{
|
{
|
||||||
//@TODO Fyracle bug with upper
|
String value = valueField.getText().toUpperCase();
|
||||||
String value;
|
|
||||||
if(DB.isFyracle()){
|
|
||||||
value = valueField.getText();
|
|
||||||
}else{
|
|
||||||
value = valueField.getText().toUpperCase();
|
|
||||||
}
|
|
||||||
if (!value.endsWith("%"))
|
if (!value.endsWith("%"))
|
||||||
value += "%";
|
value += "%";
|
||||||
m_query.addRestriction((DB.isFyracle()?"Value":"UPPER(Value)"), MQuery.LIKE, value, valueLabel.getText(), value);
|
m_query.addRestriction("UPPER(Value)", MQuery.LIKE, value, valueLabel.getText(), value);
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
if (hasDocNo && !docNoField.getText().equals("%") && docNoField.getText().length() != 0)
|
if (hasDocNo && !docNoField.getText().equals("%") && docNoField.getText().length() != 0)
|
||||||
{
|
{
|
||||||
String value;
|
String value = docNoField.getText().toUpperCase();
|
||||||
if(DB.isFyracle()){
|
|
||||||
value = docNoField.getText();
|
|
||||||
}else{
|
|
||||||
value = docNoField.getText().toUpperCase();
|
|
||||||
}
|
|
||||||
if (!value.endsWith("%"))
|
if (!value.endsWith("%"))
|
||||||
value += "%";
|
value += "%";
|
||||||
m_query.addRestriction((DB.isFyracle()?"DocumentNo":"UPPER(DocumentNo)"), MQuery.LIKE, value, docNoLabel.getText(), value);
|
m_query.addRestriction("UPPER(DocumentNo)", MQuery.LIKE, value, docNoLabel.getText(), value);
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
if ((hasName) && !nameField.getText().equals("%") && nameField.getText().length() != 0)
|
if ((hasName) && !nameField.getText().equals("%") && nameField.getText().length() != 0)
|
||||||
{
|
{
|
||||||
String value;
|
String value = nameField.getText().toUpperCase();
|
||||||
if(DB.isFyracle()){
|
|
||||||
value = nameField.getText();
|
|
||||||
}else{
|
|
||||||
value = nameField.getText().toUpperCase();
|
|
||||||
}
|
|
||||||
if (!value.endsWith("%"))
|
if (!value.endsWith("%"))
|
||||||
value += "%";
|
value += "%";
|
||||||
m_query.addRestriction((DB.isFyracle()?"Name":"UPPER(Name)"), MQuery.LIKE, value, nameLabel.getText(), value);
|
m_query.addRestriction("UPPER(Name)", MQuery.LIKE, value, nameLabel.getText(), value);
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
if (hasDescription && !descriptionField.getText().equals("%") && descriptionField.getText().length() != 0)
|
if (hasDescription && !descriptionField.getText().equals("%") && descriptionField.getText().length() != 0)
|
||||||
|
|
Loading…
Reference in New Issue