Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-24 16:41:40 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-20 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Escaped all SQL identifiers in 'tests/'.
	* Replaced " with ' delimiters in all SQL literal strings in
	'tests/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-20 11:19:24 -04:00
parent 65b6c9e671
commit 2d701bfc4c
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21543,3 +21543,7 @@
* Escaped all SQL identifiers in 'ripcd/'. * Escaped all SQL identifiers in 'ripcd/'.
* Replaced " with ' delimiters in all SQL literal strings in * Replaced " with ' delimiters in all SQL literal strings in
'ripcd/'. 'ripcd/'.
2021-04-20 Fred Gleason <fredg@paravelsystems.com>
* Escaped all SQL identifiers in 'tests/'.
* Replaced " with ' delimiters in all SQL literal strings in
'tests/'.

36
tests/feed_image_test.cpp
View File

@ -2,7 +2,7 @@
// //
// Test Rivendell image storage // Test Rivendell image storage
// //
// (C) Copyright 2010-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2010-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -191,13 +191,13 @@ void MainObject::RunList()
RDSqlQuery *q=NULL; RDSqlQuery *q=NULL;
sql=QString("select ")+ sql=QString("select ")+
"ID,"+ // 00 "`ID`,"+ // 00
"WIDTH,"+ // 01 "`WIDTH`,"+ // 01
"HEIGHT,"+ // 02 "`HEIGHT`,"+ // 02
"DEPTH,"+ // 03 "`DEPTH`,"+ // 03
"DESCRIPTION "+ // 04 "`DESCRIPTION` "+ // 04
"from FEED_IMAGES where "+ "from `FEED_IMAGES` where "+
"FEED_KEY_NAME=\""+RDEscapeString(test_feed->keyName())+"\""; "`FEED_KEY_NAME`='"+RDEscapeString(test_feed->keyName())+"'";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
printf("ID: %u\n",q->value(0).toUInt()); printf("ID: %u\n",q->value(0).toUInt());
@ -239,14 +239,14 @@ void MainObject::RunPush()
// //
// Write it to the DB // Write it to the DB
// //
sql=QString("insert into FEED_IMAGES set ")+ sql=QString("insert into `FEED_IMAGES` set ")+
QString().sprintf("FEED_ID=%u,",test_feed->id())+ QString().sprintf("`FEED_ID`=%u,",test_feed->id())+
"FEED_KEY_NAME=\""+RDEscapeString(test_feed->keyName())+"\","+ "`FEED_KEY_NAME`='"+RDEscapeString(test_feed->keyName())+"',"+
QString().sprintf("WIDTH=%d,",img->width())+ QString().sprintf("`WIDTH`=%d,",img->width())+
QString().sprintf("HEIGHT=%d,",img->height())+ QString().sprintf("`HEIGHT`=%d,",img->height())+
QString().sprintf("DEPTH=%d,",img->depth())+ QString().sprintf("`DEPTH`=%d,",img->depth())+
"DESCRIPTION=\""+RDEscapeString(test_description)+"\","+ "`DESCRIPTION`='"+RDEscapeString(test_description)+"',"+
"DATA="+RDEscapeBlob(data); "`DATA`="+RDEscapeBlob(data);
RDSqlQuery::apply(sql); RDSqlQuery::apply(sql);
} }
@ -258,8 +258,8 @@ void MainObject::RunPop()
QByteArray data; QByteArray data;
FILE *f=NULL; FILE *f=NULL;
sql=QString("select DATA from FEED_IMAGES where ")+ sql=QString("select `DATA` from `FEED_IMAGES` where ")+
QString().sprintf("ID=%u",test_image_id); QString().sprintf("`ID`=%u",test_image_id);
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
if((f=fopen(test_filename.toUtf8(),"w"))==NULL) { if((f=fopen(test_filename.toUtf8(),"w"))==NULL) {