Merge branch 'develop' into prototype/Swift_3_2

# Conflicts:
#	Sources/DynamicSchema+Convenience.swift
This commit is contained in:
John Estropia committed 2017-08-31 18:33:12 +09:00
commit 0b57cff27d
5 files changed
+15 -15

No files matched your search

+1 -1
View File
@@ -114,7 +114,7 @@ public extension DynamicSchema {
}
case .decimalAttributeType:
valueType = NSDecimalNumber.self
if let defaultValue = (attribute.defaultValue as! NSDecimalNumber.QueryableNativeType?).flatMap(NSDecimalNumber.cs_fromQueryableNativeType) {
if let defaultValue = (attribute.defaultValue as! NSDecimalNumber?) {
defaultString = ", initial: NSDecimalNumber(string: \"\(defaultValue.description(withLocale: nil))\")"
}