Fixed test for array boundary.

Michael Meskes · Michael Meskes · commit 6e41fa2e5cd8 · 2012-10-05T17:49:17.000+02:00
Instead of continuing if the next character is not an array boundary get_data()
used to continue only on finding a boundary so it was not able to read any
element after the first.
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
@@ -422,6 +422,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH,
 									   NULL);
+						pval++;
 						break;
 					}
 					else if (pval[0] == 't' && pval[1] == '\0')
@@ -434,6 +435,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH,
 									   NULL);
+						pval++;
 						break;
 					}
 					else if (pval[0] == '\0' && PQgetisnull(results, act_tuple, act_field))
@@ -777,7 +779,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					++pval;
 			}
 		}
-	} while (*pval != '\0' && array_boundary(isarray, *pval));
+	} while (*pval != '\0' && !array_boundary(isarray, *pval));
 
 	return (true);
 }

Original file line number	Diff line number	Diff line change
`@@ -422,6 +422,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,`
`422`	`422`	`ecpg_raise(lineno, ECPG_CONVERT_BOOL,`
`423`	`423`	`ECPG_SQLSTATE_DATATYPE_MISMATCH,`
`424`	`424`	`NULL);`
	`425`	`+ pval++;`
`425`	`426`	`break;`
`426`	`427`	`}`
`427`	`428`	`else if (pval[0] == 't' && pval[1] == '\0')`
`@@ -434,6 +435,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,`
`434`	`435`	`ecpg_raise(lineno, ECPG_CONVERT_BOOL,`
`435`	`436`	`ECPG_SQLSTATE_DATATYPE_MISMATCH,`
`436`	`437`	`NULL);`
	`438`	`+ pval++;`
`437`	`439`	`break;`
`438`	`440`	`}`
`439`	`441`	`else if (pval[0] == '\0' && PQgetisnull(results, act_tuple, act_field))`
`@@ -777,7 +779,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,`
`777`	`779`	`++pval;`
`778`	`780`	`}`
`779`	`781`	`}`
`780`		`- } while (pval != '\0' && array_boundary(isarray, pval));`
	`782`	`+ } while (pval != '\0' && !array_boundary(isarray, pval));`
`781`	`783`
`782`	`784`	`return (true);`
`783`	`785`	`}`