diff options
author | Bibiko <bibiko@eva.mpg.de> | 2010-10-10 08:48:54 +0000 |
---|---|---|
committer | Bibiko <bibiko@eva.mpg.de> | 2010-10-10 08:48:54 +0000 |
commit | 9ea6eae511d5f5bccb36ae5c31e961635ce2cc33 (patch) | |
tree | 41c1c4c8f63cc584bc0cf44a1a3215d062447d74 /Source/SPTableContent.m | |
parent | 31a31c1fb9d46e9c6db1c836e03314b0b534194c (diff) | |
download | sequelpro-9ea6eae511d5f5bccb36ae5c31e961635ce2cc33.tar.gz sequelpro-9ea6eae511d5f5bccb36ae5c31e961635ce2cc33.tar.bz2 sequelpro-9ea6eae511d5f5bccb36ae5c31e961635ce2cc33.zip |
• fixed issue of unnecessary string escaping for importing spatial data via GeomFromText()
• minor code cosmetics
Diffstat (limited to 'Source/SPTableContent.m')
-rw-r--r-- | Source/SPTableContent.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 027f86a3..f6174366 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -2393,7 +2393,7 @@ [rowValue setString:@"CURRENT_TIMESTAMP"]; } else if ( [[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"typegrouping"] isEqualToString:@"geometry"] ) { - [rowValue setString:([rowObject isKindOfClass:[MCPGeometryData class]]) ? [[rowObject wktString] getGeomFromTextFromString] : [(NSString*)rowObject getGeomFromTextFromString]]; + [rowValue setString:([rowObject isKindOfClass:[MCPGeometryData class]]) ? [[rowObject wktString] getGeomFromTextString] : [(NSString*)rowObject getGeomFromTextString]]; // Convert the object to a string (here we can add special treatment for date-, number- and data-fields) } else if ( [rowObject isNSNull] || ([rowObject isMemberOfClass:[NSString class]] && [[rowObject description] isEqualToString:@""]) ) { @@ -3566,7 +3566,7 @@ } else if([anObject isEqualToString:[prefs stringForKey:SPNullValue]]) { newObject = @"NULL"; } else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"geometry"]) { - newObject = [(NSString*)anObject getGeomFromTextFromString]; + newObject = [(NSString*)anObject getGeomFromTextString]; } else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"bit"]) { newObject = [NSString stringWithFormat:@"b'%@'", ((![[anObject description] length] || [[anObject description] isEqualToString:@"0"]) ? @"0" : [anObject description])]; } else if ([[columnDefinition objectForKey:@"typegrouping"] isEqualToString:@"date"] |