Merge pull request #382 from Mytherin/redshift

Mytherin · web-flow · commit b63ef4b1eb00 · 2025-11-10T21:30:45.000+01:00
Automatically turn on text protocol when connecting to redshift
diff --git a/src/include/postgres_version.hpp b/src/include/postgres_version.hpp
@@ -12,7 +12,7 @@
 
 namespace duckdb {
 
-enum class PostgresInstanceType { UNKNOWN, POSTGRES, AURORA };
+enum class PostgresInstanceType { UNKNOWN, POSTGRES, AURORA, REDSHIFT };
 
 struct PostgresVersion {
 	PostgresVersion() {
diff --git a/src/postgres_connection.cpp b/src/postgres_connection.cpp
@@ -128,10 +128,14 @@ PostgresVersion PostgresConnection::GetPostgresVersion() {
 		version.type_v = PostgresInstanceType::UNKNOWN;
 		return version;
 	}
-	auto version = PostgresUtils::ExtractPostgresVersion(result->GetString(0, 0));
+	auto pg_version_string = result->GetString(0, 0);
+	auto version = PostgresUtils::ExtractPostgresVersion(pg_version_string);
 	if (result->GetInt64(0, 1) > 0) {
 		version.type_v = PostgresInstanceType::AURORA;
 	}
+	if (StringUtil::Contains(pg_version_string, "Redshift")) {
+		version.type_v = PostgresInstanceType::REDSHIFT;
+	}
 	return version;
 }
 
diff --git a/src/postgres_scanner.cpp b/src/postgres_scanner.cpp
@@ -130,6 +130,9 @@ void PostgresScanFunction::PrepareBind(PostgresVersion version, ClientContext &c
 	}
 	bind_data.SetTablePages(approx_num_pages);
 	bind_data.version = version;
+	if (version.type_v == PostgresInstanceType::REDSHIFT) {
+		bind_data.use_text_protocol = true;
+	}
 }
 
 PostgresBindData::PostgresBindData(ClientContext &context) {

Original file line number	Diff line number	Diff line change
`@@ -128,10 +128,14 @@ PostgresVersion PostgresConnection::GetPostgresVersion() {`
`128`	`128`	`version.type_v = PostgresInstanceType::UNKNOWN;`
`129`	`129`	`return version;`
`130`	`130`	`}`
`131`		`- auto version = PostgresUtils::ExtractPostgresVersion(result->GetString(0, 0));`
	`131`	`+ auto pg_version_string = result->GetString(0, 0);`
	`132`	`+ auto version = PostgresUtils::ExtractPostgresVersion(pg_version_string);`
`132`	`133`	`if (result->GetInt64(0, 1) > 0) {`
`133`	`134`	`version.type_v = PostgresInstanceType::AURORA;`
`134`	`135`	`}`
	`136`	`+ if (StringUtil::Contains(pg_version_string, "Redshift")) {`
	`137`	`+ version.type_v = PostgresInstanceType::REDSHIFT;`
	`138`	`+ }`
`135`	`139`	`return version;`
`136`	`140`	`}`
`137`	`141`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ void PostgresScanFunction::PrepareBind(PostgresVersion version, ClientContext &c`
`130`	`130`	`}`
`131`	`131`	`bind_data.SetTablePages(approx_num_pages);`
`132`	`132`	`bind_data.version = version;`
	`133`	`+ if (version.type_v == PostgresInstanceType::REDSHIFT) {`
	`134`	`+ bind_data.use_text_protocol = true;`
	`135`	`+ }`
`133`	`136`	`}`
`134`	`137`
`135`	`138`	`PostgresBindData::PostgresBindData(ClientContext &context) {`