@@ -2801,14 +2801,15 @@ - (BOOL)saveRowToTable
2801
2801
fieldValue = [mySQLConnection escapeAndQuoteData:rowObject];
2802
2802
2803
2803
} else {
2804
- if ([[rowObject description] isEqualToString:@"CURRENT_TIMESTAMP"]) {
2805
- fieldValue = @"CURRENT_TIMESTAMP";
2804
+ NSString *desc = [rowObject description];
2805
+ if ([desc isMatchedByRegex:SPCurrentTimestampPattern]) {
2806
+ fieldValue = desc;
2806
2807
} else if ([fieldTypeGroup isEqualToString:@"bit"]) {
2807
- fieldValue = [NSString stringWithFormat:@"b'%@'", ((![[rowObject description] length] || [[rowObject description] isEqualToString:@"0"]) ? @"0" : [rowObject description] )];
2808
- } else if ([fieldTypeGroup isEqualToString:@"date"] && [[rowObject description] isEqualToString:@"NOW()"]) {
2808
+ fieldValue = [NSString stringWithFormat:@"b'%@'", ((![desc length] || [desc isEqualToString:@"0"]) ? @"0" : desc )];
2809
+ } else if ([fieldTypeGroup isEqualToString:@"date"] && [desc isEqualToString:@"NOW()"]) {
2809
2810
fieldValue = @"NOW()";
2810
2811
} else {
2811
- fieldValue = [mySQLConnection escapeAndQuoteString:[rowObject description] ];
2812
+ fieldValue = [mySQLConnection escapeAndQuoteString:desc ];
2812
2813
}
2813
2814
}
2814
2815
}
@@ -3426,19 +3427,19 @@ - (void)saveViewCellValue:(id)anObject forTableColumn:(NSTableColumn *)aTableCol
3426
3427
} else if ( [anObject isKindOfClass:[NSData class]] ) {
3427
3428
newObject = [mySQLConnection escapeAndQuoteData:anObject];
3428
3429
} else {
3429
- if ( [[anObject description] isEqualToString:@"CURRENT_TIMESTAMP"] ) {
3430
- newObject = @"CURRENT_TIMESTAMP";
3430
+ NSString *desc = [anObject description];
3431
+ if ( [desc isMatchedByRegex:SPCurrentTimestampPattern] ) {
3432
+ newObject = desc;
3431
3433
} else if([anObject isEqualToString:[prefs stringForKey:SPNullValue]]) {
3432
3434
newObject = @"NULL";
3433
3435
} else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"geometry"]) {
3434
3436
newObject = [(NSString*)anObject getGeomFromTextString];
3435
3437
} else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"bit"]) {
3436
- newObject = [NSString stringWithFormat:@"b'%@'", ((![[anObject description] length] || [[anObject description] isEqualToString:@"0"]) ? @"0" : [anObject description])];
3437
- } else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"date"]
3438
- && [[anObject description] isEqualToString:@"NOW()"]) {
3438
+ newObject = [NSString stringWithFormat:@"b'%@'", ((![desc length] || [desc isEqualToString:@"0"]) ? @"0" : desc)];
3439
+ } else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"date"] && [desc isEqualToString:@"NOW()"]) {
3439
3440
newObject = @"NOW()";
3440
3441
} else {
3441
- newObject = [mySQLConnection escapeAndQuoteString:[anObject description] ];
3442
+ newObject = [mySQLConnection escapeAndQuoteString:desc ];
3442
3443
}
3443
3444
}
3444
3445
0 commit comments