Minor dbf2pg fixes from Martin Pitt: check for failure when issuing

tglsfdc · tglsfdc · commit dd0fa0f958af · 2005-10-06T23:05:22.000Z
CREATE TABLE command, and translate dBase's 'M' field type to 'text'.
diff --git a/contrib/dbase/dbf2pg.c b/contrib/dbase/dbf2pg.c
@@ -301,6 +301,9 @@ do_create(PGconn *conn, char *table, dbhead * dbh)
 			case 'L':
 				strcat(query, " char");
 				break;
+			case 'M':
+				strcat(query, " text");
+				break;
 		}
 	}
 
@@ -312,7 +315,8 @@ do_create(PGconn *conn, char *table, dbhead * dbh)
 		printf("%s\n", query);
 	}
 
-	if ((res = PQexec(conn, query)) == NULL)
+	if ((res = PQexec(conn, query)) == NULL ||
+		PQresultStatus(res) != PGRES_COMMAND_OK)
 	{
 		fprintf(stderr, "Error creating table!\n");
 		fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,9 @@ do_create(PGconn conn, char table, dbhead * dbh)`
`301`	`301`	`case 'L':`
`302`	`302`	`strcat(query, " char");`
`303`	`303`	`break;`
	`304`	`+ case 'M':`
	`305`	`+ strcat(query, " text");`
	`306`	`+ break;`
`304`	`307`	`}`
`305`	`308`	`}`
`306`	`309`
`@@ -312,7 +315,8 @@ do_create(PGconn conn, char table, dbhead * dbh)`
`312`	`315`	`printf("%s\n", query);`
`313`	`316`	`}`
`314`	`317`
`315`		`- if ((res = PQexec(conn, query)) == NULL)`
	`318`	`+ if ((res = PQexec(conn, query)) == NULL \|\|`
	`319`	`+ PQresultStatus(res) != PGRES_COMMAND_OK)`
`316`	`320`	`{`
`317`	`321`	`fprintf(stderr, "Error creating table!\n");`
`318`	`322`	`fprintf(stderr, "Detailed report: %s\n", PQerrorMessage(conn));`