2018-07-12 Fred Gleason <fredg@paravelsystems.com>

* Cleaned up SQL quieries in 'lib/' ensure UTF-8 compatibility.
This commit is contained in:
Fred Gleason
2018-07-12 13:47:20 -04:00
parent bc2ada9b22
commit 363dbb7878
67 changed files with 1617 additions and 2040 deletions

View File

@@ -43,8 +43,8 @@ RDGroup::RDGroup(QString name,bool create,QSqlDatabase *db)
group_name=name;
if(create) {
sql=QString().sprintf("INSERT INTO GROUPS SET NAME=\"%s\"",
(const char *)RDEscapeString(group_name));
sql=QString("insert into GROUPS set ")+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql,group_db);
delete q;
}
@@ -243,9 +243,11 @@ int RDGroup::freeCartQuantity() const
QString sql;
RDSqlQuery *q;
sql=QString().sprintf("select DEFAULT_LOW_CART,DEFAULT_HIGH_CART\
from GROUPS where NAME=\"%s\"",
(const char *)group_name);
sql=QString("select ")+
"DEFAULT_LOW_CART,"+ // 00
"DEFAULT_HIGH_CART "+ // 01
"from GROUPS where "+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql);
if(!q->first()) {
delete q;
@@ -257,9 +259,9 @@ int RDGroup::freeCartQuantity() const
}
int low=q->value(0).toInt();
int high=q->value(1).toInt();
sql=QString().sprintf("select NUMBER from CART\
where (NUMBER>=%d)&&(NUMBER<=%d)",
q->value(0).toInt(),q->value(1).toInt());
sql=QString("select NUMBER from CART where ")+
QString().sprintf("NUMBER>=%d)&&(NUMBER<=%d)",
q->value(0).toInt(),q->value(1).toInt());
delete q;
q=new RDSqlQuery(sql);
int free=high-low-q->size();
@@ -311,9 +313,12 @@ bool RDGroup::cartNumberValid(unsigned cartnum) const
return false;
}
bool ret=false;
QString sql=QString().sprintf("select DEFAULT_LOW_CART,DEFAULT_HIGH_CART,\
ENFORCE_CART_RANGE from GROUPS \
where NAME=\"%s\"",(const char *)group_name);
QString sql=QString("select ")+
"DEFAULT_LOW_CART,"+ // 00
"DEFAULT_HIGH_CART,"+ // 01
"ENFORCE_CART_RANGE "+ // 02
"from GROUPS where "+
"NAME=\""+RDEscapeString(group_name)+"\"";
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
if(!RDBool(q->value(2).toString())) {
@@ -336,12 +341,20 @@ QString RDGroup::xml() const
RDSqlQuery *q;
QString ret="";
sql=QString().sprintf("select DESCRIPTION,DEFAULT_CART_TYPE,DEFAULT_LOW_CART,\
DEFAULT_HIGH_CART,CUT_SHELFLIFE,DEFAULT_TITLE,\
ENFORCE_CART_RANGE,REPORT_TFC,REPORT_MUS,\
ENABLE_NOW_NEXT,COLOR \
from GROUPS where NAME=\"%s\"",
(const char *)RDEscapeString(group_name));
sql=QString("select ")+
"DESCRIPTION,"+ // 00
"DEFAULT_CART_TYPE,"+ // 01
"DEFAULT_LOW_CART,"+ // 02
"DEFAULT_HIGH_CART,"+ // 03
"CUT_SHELFLIFE,"+ // 04
"DEFAULT_TITLE,"+ // 05
"ENFORCE_CART_RANGE,"+ // 06
"REPORT_TFC,"+ // 07
"REPORT_MUS,"+ // 08
"ENABLE_NOW_NEXT,"+ // 09
"COLOR "+ // 10
"from GROUPS where "+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
ret+="<group>\n";
@@ -382,9 +395,11 @@ unsigned RDGroup::GetNextFreeCart(unsigned startcart) const
unsigned cart_low_limit;
unsigned cart_high_limit;
sql=QString().sprintf("select DEFAULT_LOW_CART,DEFAULT_HIGH_CART\
from GROUPS where NAME=\"%s\"",
(const char *)group_name);
sql=QString("select ")+
"DEFAULT_LOW_CART,"+ // 00
"DEFAULT_HIGH_CART "+ // 01
"from GROUPS where "+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
if(startcart>q->value(0).toUInt()) {
@@ -459,10 +474,9 @@ void RDGroup::SetRow(const QString &param,int value) const
RDSqlQuery *q;
QString sql;
sql=QString().sprintf("UPDATE GROUPS SET %s=%d WHERE NAME=\"%s\"",
(const char *)param,
value,
(const char *)group_name);
sql=QString().sprintf("update GROUPS set ")+
param+QString().sprintf("=%d where ",value)+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql,group_db);
delete q;
}
@@ -473,10 +487,9 @@ void RDGroup::SetRow(const QString &param,unsigned value) const
RDSqlQuery *q;
QString sql;
sql=QString().sprintf("UPDATE GROUPS SET %s=%u WHERE NAME=\"%s\"",
(const char *)param,
value,
(const char *)group_name);
sql=QString("update GROUPS set ")+
param+QString().sprintf("=%u where ",value)+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql,group_db);
delete q;
}
@@ -487,10 +500,9 @@ void RDGroup::SetRow(const QString &param,const QString &value) const
RDSqlQuery *q;
QString sql;
sql=QString().sprintf("UPDATE GROUPS SET %s=\"%s\" WHERE NAME=\"%s\"",
(const char *)param,
(const char *)RDEscapeString(value),
(const char *)group_name);
sql=QString("update GROUPS set ")+
param+"=\""+RDEscapeString(value)+"\" where "+
"NAME=\""+RDEscapeString(group_name)+"\"";
q=new RDSqlQuery(sql,group_db);
delete q;
}