Merge pull request #195 from karllhughes/master

mevdschee · web-flow · commit e550cb85a9fc · 2017-02-28T08:00:38.000+01:00
Allowing json, jsonb in postgres
diff --git a/api.php b/api.php
@@ -471,7 +471,7 @@ public function isGeometryType($field) {
 	}
 
 	public function isJsonType($field) {
-		return $field->type == 'jsonb';
+        return in_array($field->type,array('json','jsonb'));
 	}
 
 	public function getDefaultCharset() {
@@ -1075,11 +1075,11 @@ public function isBinaryType($field) {
 	}
 
 	public function isGeometryType($field) {
-		return in_array($field->type,array('geometry'));;
+		return in_array($field->type,array('geometry'));
 	}
 
 	public function isJsonType($field) {
-		return in_array($field->type,array('json','jsonb'));;
+		return in_array($field->type,array('json','jsonb'));
 	}
 
 	public function getDefaultCharset() {

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ public function isGeometryType($field) {`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`public function isJsonType($field) {`
`474`		`- return $field->type == 'jsonb';`
	`474`	`+ return in_array($field->type,array('json','jsonb'));`
`475`	`475`	`}`
`476`	`476`
`477`	`477`	`public function getDefaultCharset() {`
`@@ -1075,11 +1075,11 @@ public function isBinaryType($field) {`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`	`1077`	`public function isGeometryType($field) {`
`1078`		`- return in_array($field->type,array('geometry'));;`
	`1078`	`+ return in_array($field->type,array('geometry'));`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`	`1081`	`public function isJsonType($field) {`
`1082`		`- return in_array($field->type,array('json','jsonb'));;`
	`1082`	`+ return in_array($field->type,array('json','jsonb'));`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`	`1085`	`public function getDefaultCharset() {`