• CSV Import

- if a parsed row in the csv file doesn't have the same number of columns as the first row fill the missing columns with SPNotLoaded to allow while importing that these missing data can be replaced by the table column's DEFAULT value
- fixed tiny issue for field mapper sheet to display the correct tooltip for default values
• SPTableData
- ATTENTION: changed the object for returned key 'default': if its value is NULL now it returns a [NSNull null] object
- changed instances to handle this  [NSNull null] object (must be checked)

1 files changed, 6 insertions, 8 deletions

diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index 34ab2358..698270fe 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -749,13 +749,8 @@
 		}
 
 		// Select the column default if available
-		if ([resultRow objectForKey:@"Default"]) {
-			if ([[resultRow objectForKey:@"Default"] isNSNull]) {
-				[tableColumn setValue:[NSString stringWithString:[[NSUserDefaults standardUserDefaults] objectForKey:SPNullValue]] forKey:@"default"];			
-			} else {
-				[tableColumn setValue:[NSString stringWithString:[resultRow objectForKey:@"Default"]] forKey:@"default"];
-			}
-		}
+		if ([resultRow objectForKey:@"Default"])
+			[tableColumn setObject:[NSString stringWithString:[resultRow objectForKey:@"Default"]] forKey:@"default"];
 
 		// Add the column to the list
 		[tableColumns addObject:[NSDictionary dictionaryWithDictionary:tableColumn]];
@@ -1017,7 +1012,10 @@
 		// Field defaults
 		} else if ([detailString isEqualToString:@"DEFAULT"] && (definitionPartsIndex + 1 < partsArrayLength)) {
 			detailParser = [[SPSQLParser alloc] initWithString:[definitionParts objectAtIndex:definitionPartsIndex+1]];
-			[fieldDetails setValue:[detailParser unquotedString] forKey:@"default"];
+			if([[detailParser unquotedString] isEqualToString:@"NULL"])
+				[fieldDetails setObject:[NSNull null] forKey:@"default"];
+			else
+				[fieldDetails setValue:[detailParser unquotedString] forKey:@"default"];
 			[detailParser release];
 			definitionPartsIndex++;