Add db long string support

enums · enums · commit 95495eb1282e · 2018-06-20T13:08:09.000+08:00
diff --git a/Source/Pjango/DB/PCDataBase.swift b/Source/Pjango/DB/PCDataBase.swift
@@ -155,6 +155,7 @@ open class PCDataBase {
             switch field.type {
             case .string: return field.strValue
             case .int: return "\(field.intValue)"
+            case .text: return field.strValue
             case .unknow: return nil
             }
         }
@@ -188,6 +189,11 @@ open class PCDataBase {
                     return nil
                 }
                 return "\(intValue)"
+            case .text:
+                guard let textValue = value as? String else {
+                    return nil
+                }
+                return textValue
             case .unknow: return nil
             }
         }
diff --git a/Source/Pjango/DB/PCDataBaseField.swift b/Source/Pjango/DB/PCDataBaseField.swift
@@ -12,12 +12,13 @@ public enum PCDataBaseFieldType: String {
     case unknow = ""
     case string = "VARCHAR"
     case int = "INT"
+    case text = "TEXT"
 }
+
 public protocol PCModelDataBaseFieldType { }
 extension String: PCModelDataBaseFieldType { }
 extension Int: PCModelDataBaseFieldType { }
 
-
 final public class PCDataBaseField {
     
     public weak var model: PCModel? = nil 
diff --git a/Source/Pjango/DB/PCFileDBDataBase.swift b/Source/Pjango/DB/PCFileDBDataBase.swift
@@ -122,6 +122,7 @@ open class PCFileDBDataBase: PCDataBase {
             switch field.type {
             case .string: return field.strValue
             case .int: return "\(field.intValue)"
+            case .text: return field.strValue
             case .unknow: return nil
             }
         }
@@ -161,6 +162,11 @@ open class PCFileDBDataBase: PCDataBase {
                     return nil
                 }
                 return "\(intValue)"
+            case .text:
+                guard let textValue = value as? String else {
+                    return nil
+                }
+                return textValue
             case .unknow: return nil
             }
         }
diff --git a/Source/Pjango/Model/PCModel.swift b/Source/Pjango/Model/PCModel.swift
@@ -28,6 +28,7 @@ open class PCModel: PCObject, PCViewable {
         case .unknow: return nil
         case .string: return value as? String
         case .int: return value as? Int
+        case .text: return value as? String
         }
     }
     
@@ -45,7 +46,7 @@ open class PCModel: PCObject, PCViewable {
             return
         }
         switch type {
-        case .string:
+        case .string, .text:
             guard let strValue = value as? String else {
                 return
             }
@@ -60,7 +61,8 @@ open class PCModel: PCObject, PCViewable {
                 return
             }
             _pjango_core_model_fields_value[key] = intValue
-        default: return
+        case .unknow:
+            return
         }
     }
     
@@ -103,7 +105,9 @@ open class PCModel: PCObject, PCViewable {
             guard let recordsFromDB = PjangoRuntime._pjango_runtime_database.selectTable(model: meta, ext: ext?.param) else {
                 return nil
             }
-            _pjango_core_model_cache[_pjango_core_class_name] = recordsFromDB
+            if ext?.useCache == true {
+                _pjango_core_model_cache[_pjango_core_class_name] = recordsFromDB
+            }
             _pjango_core_model_cache_time[_pjango_core_class_name] = nowTime.timeIntervalSince1970
             records = recordsFromDB
         }

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ open class PCDataBase {`
`155`	`155`	`switch field.type {`
`156`	`156`	`case .string: return field.strValue`
`157`	`157`	`case .int: return "\(field.intValue)"`
	`158`	`+ case .text: return field.strValue`
`158`	`159`	`case .unknow: return nil`
`159`	`160`	`}`
`160`	`161`	`}`
`@@ -188,6 +189,11 @@ open class PCDataBase {`
`188`	`189`	`return nil`
`189`	`190`	`}`
`190`	`191`	`return "\(intValue)"`
	`192`	`+ case .text:`
	`193`	`+ guard let textValue = value as? String else {`
	`194`	`+ return nil`
	`195`	`+ }`
	`196`	`+ return textValue`
`191`	`197`	`case .unknow: return nil`
`192`	`198`	`}`
`193`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ open class PCFileDBDataBase: PCDataBase {`
`122`	`122`	`switch field.type {`
`123`	`123`	`case .string: return field.strValue`
`124`	`124`	`case .int: return "\(field.intValue)"`
	`125`	`+ case .text: return field.strValue`
`125`	`126`	`case .unknow: return nil`
`126`	`127`	`}`
`127`	`128`	`}`
`@@ -161,6 +162,11 @@ open class PCFileDBDataBase: PCDataBase {`
`161`	`162`	`return nil`
`162`	`163`	`}`
`163`	`164`	`return "\(intValue)"`
	`165`	`+ case .text:`
	`166`	`+ guard let textValue = value as? String else {`
	`167`	`+ return nil`
	`168`	`+ }`
	`169`	`+ return textValue`
`164`	`170`	`case .unknow: return nil`
`165`	`171`	`}`
`166`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ open class PCModel: PCObject, PCViewable {`
`28`	`28`	`case .unknow: return nil`
`29`	`29`	`case .string: return value as? String`
`30`	`30`	`case .int: return value as? Int`
	`31`	`+ case .text: return value as? String`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
`@@ -45,7 +46,7 @@ open class PCModel: PCObject, PCViewable {`
`45`	`46`	`return`
`46`	`47`	`}`
`47`	`48`	`switch type {`
`48`		`- case .string:`
	`49`	`+ case .string, .text:`
`49`	`50`	`guard let strValue = value as? String else {`
`50`	`51`	`return`
`51`	`52`	`}`
`@@ -60,7 +61,8 @@ open class PCModel: PCObject, PCViewable {`
`60`	`61`	`return`
`61`	`62`	`}`
`62`	`63`	`_pjango_core_model_fields_value[key] = intValue`
`63`		`- default: return`
	`64`	`+ case .unknow:`
	`65`	`+ return`
`64`	`66`	`}`
`65`	`67`	`}`
`66`	`68`
`@@ -103,7 +105,9 @@ open class PCModel: PCObject, PCViewable {`
`103`	`105`	`guard let recordsFromDB = PjangoRuntime._pjango_runtime_database.selectTable(model: meta, ext: ext?.param) else {`
`104`	`106`	`return nil`
`105`	`107`	`}`
`106`		`- _pjango_core_model_cache[_pjango_core_class_name] = recordsFromDB`
	`108`	`+ if ext?.useCache == true {`
	`109`	`+ _pjango_core_model_cache[_pjango_core_class_name] = recordsFromDB`
	`110`	`+ }`
`107`	`111`	`_pjango_core_model_cache_time[_pjango_core_class_name] = nowTime.timeIntervalSince1970`
`108`	`112`	`records = recordsFromDB`
`109`	`113`	`}`