gnustep/libs-gdl2
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gdl2.git synced 2025-04-23 13:10:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m

Browse source 
(-formatValue:forAttribute:): Use unichars, and getCharacter:.
        in case insertString: modifies the string buffer.
        * EOAdaptors/SQLiteAdaptor/SQLiteExpression.m (escapeString): Ditto.
        Rename to escapeValue, since it works on values other than strings.



git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@26320 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Matt Rice 2008-03-16 21:03:03 +00:00
parent 6604969b06
commit ec9c41f779
3 changed files with 53 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-03-16 Matt Rice <ratmice@gmail.com>
* EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m
(-formatValue:forAttribute:): Use unichars, and getCharacter:.
in case insertString: modifies the string buffer.
* EOAdaptors/SQLiteAdaptor/SQLiteExpression.m (escapeString): Ditto.
Rename to escapeValue, since it works on values other than strings.
2008-03-16 Tim McIntosh <tmcintos@avalon.net>
* EOControl/EOKeyValueCoding.m

59
EOAdaptors/PostgreSQLAdaptor/PostgreSQLExpression.m
View file

@ -97,9 +97,6 @@ RCS_ID("$Id$")
{
NSString *formatted = nil;
NSString *externalType;
NSMutableString *string;
const char *tempString;
int i, dif;
EOFLOGObjectFnStart();
@ -332,46 +329,36 @@ RCS_ID("$Id$")
}
else // String...
{
int length = 0;
NSMutableString *string = [NSMutableString stringWithFormat:@"%@", value];
unsigned i, dif;
unsigned length = [string length];
EOFLOGObjectLevelArgs(@"EOSQLExpression",
@"other case - value=%@ class=%@",
value, [value class]);
string = [NSMutableString stringWithFormat: @"%@", value];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"string %p='%@'",
string, string);
length=[string cStringLength];
tempString = [string cString];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"string '%@' tempString=%s",
string, tempString);
for (i = 0, dif = 0; i < length; i++)
if (length > 0)
{
switch (tempString[i])
unichar tempString[length];
[string getCharacters:tempString];
for (i = 0, dif = 0; i < length; i++)
{
case '\\':
case '\'':
[string insertString: @"\\" atIndex: dif + i];
dif++;
break;
case '_':
[string insertString: @"\\" atIndex: dif + i];
dif++;
break;
default:
break;
switch (tempString[i])
{
case '\\':
case '\'':
[string insertString: @"\\" atIndex: dif + i];
dif++;
break;
case '_':
[string insertString: @"\\" atIndex: dif + i];
dif++;
break;
default:
break;
}
}
}
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"string '%@' tempString=%s",
string, tempString);
formatted = [NSString stringWithFormat: @"'%@'", string];
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"formatted %p=%@",
formatted, formatted);
}
EOFLOGObjectLevelArgs(@"EOSQLExpression", @"formatted=%@", formatted);

40
EOAdaptors/SQLiteAdaptor/SQLite3Expression.m
View file

@ -37,27 +37,31 @@
#include <Foundation/NSData.h>
@implementation SQLite3Expression
static NSString *escapeString(NSString *value)
static NSString *escapeValue(id value)
{
int length = 0, dif, i;
NSMutableString *string = [NSMutableString stringWithFormat: @"%@", value];
const char *tempString;
length=[string cStringLength];
tempString = [string cString];
unsigned length = [string length];
unsigned dif, i;
for (i = 0, dif = 0; i < length; i++)
if (length)
{
switch (tempString[i])
unichar tempString[length];
[string getCharacters:tempString];
for (i = 0, dif = 0; i < length; i++)
{
case '\'':
[string insertString: @"'" atIndex: dif + i];
dif++;
break;
default:
break;
}
}
switch (tempString[i])
{
case '\'':
[string insertString: @"'" atIndex: dif + i];
dif++;
break;
default:
break;
}
}
}
return string;
}
@ -76,7 +80,7 @@ static NSString *escapeString(NSString *value)
}
else if ([externalType isEqual:@"TEXT"])
{
return [NSString stringWithFormat:@"'%@'", escapeString(value)];
return [NSString stringWithFormat:@"'%@'", escapeValue(value)];
}
else if ([externalType isEqual:@"BLOB"])
{
@ -84,7 +88,7 @@ static NSString *escapeString(NSString *value)
}
else
{
return [NSString stringWithFormat:@"'%@'", escapeString(value)];
return [NSString stringWithFormat:@"'%@'", escapeValue(value)];
}
}
- (NSString *)lockClause