diff options
author | Bibiko <bibiko@eva.mpg.de> | 2010-10-25 12:45:18 +0000 |
---|---|---|
committer | Bibiko <bibiko@eva.mpg.de> | 2010-10-25 12:45:18 +0000 |
commit | be97d12d4f5df97b268bd017f124d932f8d5d4a9 (patch) | |
tree | 36a6cd1273d862f31e758d1c5973f23fade660a8 /Source/SPTableContent.m | |
parent | 0915f9d8dcdf2177ce700dca036a629d00178dcd (diff) | |
download | sequelpro-be97d12d4f5df97b268bd017f124d932f8d5d4a9.tar.gz sequelpro-be97d12d4f5df97b268bd017f124d932f8d5d4a9.tar.bz2 sequelpro-be97d12d4f5df97b268bd017f124d932f8d5d4a9.zip |
• improved the TableStructure handling of GEOMETRY fields and their validations against non-valid WKT notations - return NULL if no header
Diffstat (limited to 'Source/SPTableContent.m')
-rw-r--r-- | Source/SPTableContent.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index fe586e8a..c1c28c61 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -2389,9 +2389,6 @@ { [rowValue setString:@"CURRENT_TIMESTAMP"]; - } else if ( [[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"typegrouping"] isEqualToString:@"geometry"] ) { - [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:@""]) ) { @@ -2399,6 +2396,9 @@ // problem: when a number isn't set, sequel-pro enters 0 // -> second if argument isn't necessary! [rowValue setString:@"NULL"]; + } else if ( [[NSArrayObjectAtIndex(dataColumns, i) objectForKey:@"typegrouping"] isEqualToString:@"geometry"] ) { + [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 { // I don't believe any of these class matches are ever met at present. |