Merge remote-tracking branch 'origin/master'

qfrjava

2025-03-04 6506b50bffb1a1bfb20ee2e8e622b4882924270f

Merge remote-tracking branch 'origin/master'

 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAIAttachTableDef.java

@@ -7,7 +7,6 @@
import org.dom4j.Element;

import org.dom4j.Node;



import com.smtaiserver.smtaiserver.core.SMTAIServerRequest;

import com.smtaiserver.smtaiserver.database.SMTDatabase.DBRecord;

import com.smtaiserver.smtaiserver.javaai.ast.ASTDBMap;

import com.smtservlet.util.Json;


 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/attach/SMTAttachTableSqlXml.java

@@ -124,7 +124,13 @@
            

                if("like".equals(filter))

                {

                    sbWHERE.append(column + " LIKE '" + values.get(0).asString().replace("'", "''") + "'");

                    sbWHERE.append(column + " LIKE '%" + values.get(0).asString().replace("'", "''") + "%'");

                }

                else if("timerange".equals(filter))

                {

                    sbWHERE.append(

                          column + " BETWEEN '" + values.get(0).asString().replace("'", "''") + "'::timestamp AND '" 
                        + values.get(1).asString().replace("'", "''") + "'::timestamp");

                }

                else

                    throw new Exception("can't find filter op : " + filter);


 JAVA/SMTAIServer/src/main/java/com/smtaiserver/smtaiserver/core/SMTAIServerRequest.java

@@ -159,8 +159,12 @@
                    {

                        if(i > 0)

                            sbText.append(",");

                        sbText.append(listRec.get(i).asString());						
                        if(listRec.get(i).isNull())

                            sbText.append("");

                        else

                            sbText.append(listRec.get(i).asString());						
                    }

                    sbText.append("\n");

                }

                sbText.append("\n");

                list.add(sbText.toString());