Fix for #568

mevdschee · mevdschee · commit 22b282ab5bbf · 2019-08-16T17:31:55.000+02:00
diff --git a/api.php b/api.php
@@ -4702,6 +4702,16 @@ public function __construct(string $driver)
 
         public function convertColumnValue(ReflectedColumn $column): string
         {
+            if ($column->isBoolean()) {
+                switch ($this->driver) {
+                    case 'mysql':
+                        return "IFNULL(IF(?,TRUE,FALSE),NULL)";
+                    case 'pgsql':
+                        return "?";
+                    case 'sqlsrv':
+                        return "?";
+                }
+            }
             if ($column->isBinary()) {
                 switch ($this->driver) {
                     case 'mysql':
@@ -4734,7 +4744,6 @@ public function convertColumnName(ReflectedColumn $column, $value): string
                         return "encode($value::bytea, 'base64') as $value";
                     case 'sqlsrv':
                         return "CASE WHEN $value IS NULL THEN NULL ELSE (SELECT CAST($value as varbinary(max)) FOR XML PATH(''), BINARY BASE64) END as $value";
-
                 }
             }
             if ($column->isGeometry()) {
@@ -5122,6 +5131,8 @@ public function convertRecords(ReflectedTable $table, array $columnNames, array
         private function convertInputValue($conversion, $value)
         {
             switch ($conversion) {
+                case 'boolean':
+                    return $value ? 1 : 0;
                 case 'base64url_to_base64':
                     return str_pad(strtr($value, '-_', '+/'), ceil(strlen($value) / 4) * 4, '=', STR_PAD_RIGHT);
             }
@@ -5130,6 +5141,9 @@ private function convertInputValue($conversion, $value)
 
         private function getInputValueConversion(ReflectedColumn $column): string
         {
+            if ($column->isBoolean()) {
+                return 'boolean';
+            }
             if ($column->isBinary()) {
                 return 'base64url_to_base64';
             }
diff --git a/src/Tqdev/PhpCrudApi/Database/ColumnConverter.php b/src/Tqdev/PhpCrudApi/Database/ColumnConverter.php
@@ -15,6 +15,16 @@ public function __construct(string $driver)
 
     public function convertColumnValue(ReflectedColumn $column): string
     {
+        if ($column->isBoolean()) {
+            switch ($this->driver) {
+                case 'mysql':
+                    return "IFNULL(IF(?,TRUE,FALSE),NULL)";
+                case 'pgsql':
+                    return "?";
+                case 'sqlsrv':
+                    return "?";
+            }
+        }
         if ($column->isBinary()) {
             switch ($this->driver) {
                 case 'mysql':
@@ -47,7 +57,6 @@ public function convertColumnName(ReflectedColumn $column, $value): string
                     return "encode($value::bytea, 'base64') as $value";
                 case 'sqlsrv':
                     return "CASE WHEN $value IS NULL THEN NULL ELSE (SELECT CAST($value as varbinary(max)) FOR XML PATH(''), BINARY BASE64) END as $value";
-
             }
         }
         if ($column->isGeometry()) {
diff --git a/src/Tqdev/PhpCrudApi/Database/DataConverter.php b/src/Tqdev/PhpCrudApi/Database/DataConverter.php
@@ -56,6 +56,8 @@ public function convertRecords(ReflectedTable $table, array $columnNames, array
     private function convertInputValue($conversion, $value)
     {
         switch ($conversion) {
+            case 'boolean':
+                return $value ? 1 : 0;
             case 'base64url_to_base64':
                 return str_pad(strtr($value, '-_', '+/'), ceil(strlen($value) / 4) * 4, '=', STR_PAD_RIGHT);
         }
@@ -64,6 +66,9 @@ private function convertInputValue($conversion, $value)
 
     private function getInputValueConversion(ReflectedColumn $column): string
     {
+        if ($column->isBoolean()) {
+            return 'boolean';
+        }
         if ($column->isBinary()) {
             return 'base64url_to_base64';
         }
diff --git a/tests/functional/001_records/084_update_tags_with_boolean.log b/tests/functional/001_records/084_update_tags_with_boolean.log
@@ -0,0 +1,43 @@
+GET /records/tags/1
+===
+200
+Content-Type: application/json
+Content-Length: 44
+
+{"id":1,"name":"funny","is_important":false}
+===
+PUT /records/tags/1
+
+{"id":1,"name":"funny","is_important":true}
+===
+200
+Content-Type: application/json
+Content-Length: 1
+
+1
+===
+GET /records/tags/1
+===
+200
+Content-Type: application/json
+Content-Length: 43
+
+{"id":1,"name":"funny","is_important":true}
+===
+PUT /records/tags/1
+
+{"id":1,"name":"funny","is_important":false}
+===
+200
+Content-Type: application/json
+Content-Length: 1
+
+1
+===
+GET /records/tags/1
+===
+200
+Content-Type: application/json
+Content-Length: 44
+
+{"id":1,"name":"funny","is_important":false}

Original file line number	Diff line number	Diff line change
`@@ -4702,6 +4702,16 @@ public function __construct(string $driver)`
`4702`	`4702`
`4703`	`4703`	`public function convertColumnValue(ReflectedColumn $column): string`
`4704`	`4704`	`{`
	`4705`	`+ if ($column->isBoolean()) {`
	`4706`	`+ switch ($this->driver) {`
	`4707`	`+ case 'mysql':`
	`4708`	`+ return "IFNULL(IF(?,TRUE,FALSE),NULL)";`
	`4709`	`+ case 'pgsql':`
	`4710`	`+ return "?";`
	`4711`	`+ case 'sqlsrv':`
	`4712`	`+ return "?";`
	`4713`	`+ }`
	`4714`	`+ }`
`4705`	`4715`	`if ($column->isBinary()) {`
`4706`	`4716`	`switch ($this->driver) {`
`4707`	`4717`	`case 'mysql':`
`@@ -4734,7 +4744,6 @@ public function convertColumnName(ReflectedColumn $column, $value): string`
`4734`	`4744`	`return "encode($value::bytea, 'base64') as $value";`
`4735`	`4745`	`case 'sqlsrv':`
`4736`	`4746`	`return "CASE WHEN $value IS NULL THEN NULL ELSE (SELECT CAST($value as varbinary(max)) FOR XML PATH(''), BINARY BASE64) END as $value";`
`4737`		`-`
`4738`	`4747`	`}`
`4739`	`4748`	`}`
`4740`	`4749`	`if ($column->isGeometry()) {`
`@@ -5122,6 +5131,8 @@ public function convertRecords(ReflectedTable $table, array $columnNames, array`
`5122`	`5131`	`private function convertInputValue($conversion, $value)`
`5123`	`5132`	`{`
`5124`	`5133`	`switch ($conversion) {`
	`5134`	`+ case 'boolean':`
	`5135`	`+ return $value ? 1 : 0;`
`5125`	`5136`	`case 'base64url_to_base64':`
`5126`	`5137`	`return str_pad(strtr($value, '-_', '+/'), ceil(strlen($value) / 4) * 4, '=', STR_PAD_RIGHT);`
`5127`	`5138`	`}`
`@@ -5130,6 +5141,9 @@ private function convertInputValue($conversion, $value)`
`5130`	`5141`
`5131`	`5142`	`private function getInputValueConversion(ReflectedColumn $column): string`
`5132`	`5143`	`{`
	`5144`	`+ if ($column->isBoolean()) {`
	`5145`	`+ return 'boolean';`
	`5146`	`+ }`
`5133`	`5147`	`if ($column->isBinary()) {`
`5134`	`5148`	`return 'base64url_to_base64';`
`5135`	`5149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public function convertRecords(ReflectedTable $table, array $columnNames, array`
`56`	`56`	`private function convertInputValue($conversion, $value)`
`57`	`57`	`{`
`58`	`58`	`switch ($conversion) {`
	`59`	`+ case 'boolean':`
	`60`	`+ return $value ? 1 : 0;`
`59`	`61`	`case 'base64url_to_base64':`
`60`	`62`	`return str_pad(strtr($value, '-_', '+/'), ceil(strlen($value) / 4) * 4, '=', STR_PAD_RIGHT);`
`61`	`63`	`}`
`@@ -64,6 +66,9 @@ private function convertInputValue($conversion, $value)`
`64`	`66`
`65`	`67`	`private function getInputValueConversion(ReflectedColumn $column): string`
`66`	`68`	`{`
	`69`	`+ if ($column->isBoolean()) {`
	`70`	`+ return 'boolean';`
	`71`	`+ }`
`67`	`72`	`if ($column->isBinary()) {`
`68`	`73`	`return 'base64url_to_base64';`
`69`	`74`	`}`