diff options
| -rw-r--r-- | Frameworks/MCPKit/MCPFoundationKit/MCPResult.m | 3 | ||||
| -rw-r--r-- | Source/CustomQuery.m | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPResult.m b/Frameworks/MCPKit/MCPFoundationKit/MCPResult.m index f8158f7c..2fb15a88 100644 --- a/Frameworks/MCPKit/MCPFoundationKit/MCPResult.m +++ b/Frameworks/MCPKit/MCPFoundationKit/MCPResult.m @@ -626,6 +626,7 @@ const OUR_CHARSET our_charsets60[] = theType = @"longlong"; break; case FIELD_TYPE_DECIMAL: + case FIELD_TYPE_NEWDECIMAL: theType = @"decimal"; break; case FIELD_TYPE_FLOAT: @@ -1129,6 +1130,7 @@ const OUR_CHARSET our_charsets60[] = case FIELD_TYPE_BIT: return @"BIT"; case MYSQL_TYPE_DECIMAL: + case MYSQL_TYPE_NEWDECIMAL: //return isUnsigned ? (isZerofill? @"DECIMAL UNSIGNED ZEROFILL" : @"DECIMAL UNSIGNED"): return @"DECIMAL"; case MYSQL_TYPE_TINY: @@ -1238,6 +1240,7 @@ const OUR_CHARSET our_charsets60[] = case MYSQL_TYPE_FLOAT: case MYSQL_TYPE_DOUBLE: case MYSQL_TYPE_DECIMAL: + case MYSQL_TYPE_NEWDECIMAL: return @"float"; case MYSQL_TYPE_YEAR: case MYSQL_TYPE_DATETIME: diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m index b6499431..f5742df4 100644 --- a/Source/CustomQuery.m +++ b/Source/CustomQuery.m @@ -1609,16 +1609,14 @@ BOOL isFieldEditable = (!noTableName && numberOfPossibleUpdateRows == 1) ? YES : NO; - // maybe?? - // if(!isFieldEditable) - // [errorText setStringValue:[NSString stringWithFormat:@"Field is not editable. Couldn't identify field origin unambiguously (%d match%@).", numberOfPossibleUpdateRows, (numberOfPossibleUpdateRows>1)?@"es":@""]]; + if(!isFieldEditable) + [errorText setStringValue:[NSString stringWithFormat:@"Field is not editable. Couldn't identify field origin unambiguously (%d match%@).", numberOfPossibleUpdateRows, (numberOfPossibleUpdateRows>1)?@"es":@""]]; - //to enable editing simply uncomment isEditable and delete 'NO' :) SPFieldEditorController *fieldEditor = [[SPFieldEditorController alloc] init]; id editData = [[fieldEditor editWithObject:[[fullResult objectAtIndex:rowIndex] objectAtIndex:[[aTableColumn identifier] intValue]] usingEncoding:[mySQLConnection encoding] isObjectBlob:isBlob - isEditable:/*isFieldEditable*/NO + isEditable:isFieldEditable withWindow:tableWindow] retain]; if ( editData ) |