diff options
| author | Max <post@wickenrode.com> | 2015-11-04 02:01:06 +0100 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2015-11-04 02:01:06 +0100 |
| commit | 3e69d23923c0e3fe7b1312ce2c0a90acfaadbb1d (patch) | |
| tree | b1a1bc99ef147e7d795fb6f66015592ddc0ca208 /Source/SPSQLExporter.m | |
| parent | 47d9bf6d6c6dcb0810a03b268d73f3f10c513460 (diff) | |
| download | sequelpro-3e69d23923c0e3fe7b1312ce2c0a90acfaadbb1d.tar.gz sequelpro-3e69d23923c0e3fe7b1312ce2c0a90acfaadbb1d.tar.bz2 sequelpro-3e69d23923c0e3fe7b1312ce2c0a90acfaadbb1d.zip | |
Add support for CURRENT_TIMESTAMP(n) in default/on update column of DATETIME/TIMESTAMP fields (part of #2315)
Diffstat (limited to 'Source/SPSQLExporter.m')
| -rw-r--r-- | Source/SPSQLExporter.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/SPSQLExporter.m b/Source/SPSQLExporter.m index 94506728..9dffe7c1 100644 --- a/Source/SPSQLExporter.m +++ b/Source/SPSQLExporter.m @@ -884,8 +884,8 @@ [fieldString appendString:@" DEFAULT NULL"]; } } - else if (([[column objectForKey:@"type"] isEqualToString:@"TIMESTAMP"] || [[column objectForKey:@"type"] isEqualToString:@"DATETIME"]) && [column objectForKey:@"default"] != [NSNull null] && [[[column objectForKey:@"default"] uppercaseString] isEqualToString:@"CURRENT_TIMESTAMP"]) { - [fieldString appendString:@" DEFAULT CURRENT_TIMESTAMP"]; + else if (([[column objectForKey:@"type"] isInArray:@[@"TIMESTAMP",@"DATETIME"]]) && [[column objectForKey:@"default"] isMatchedByRegex:SPCurrentTimestampPattern]) { + [fieldString appendFormat:@" DEFAULT %@",[column objectForKey:@"default"]]; } else { [fieldString appendFormat:@" DEFAULT %@", [connection escapeAndQuoteString:[column objectForKey:@"default"]]]; |