Allow projections with constants or pass-through references in ExtractFilters

Author: Mytherin

src/mysql_scanner.cpp

@@ -159,7 +159,7 @@ static void MySQLScan(ClientContext &context, TableFunctionInput &data, DataChun
 }
 
 static InsertionOrderPreservingMap<string> MySQLScanToString(TableFunctionToStringInput &input) {
-  	InsertionOrderPreservingMap<string> result;
+	InsertionOrderPreservingMap<string> result;
 	auto &bind_data = input.bind_data->Cast<MySQLBindData>();
 	result["Table"] = bind_data.table.name;
 	return result;

src/mysql_utils.cpp

@@ -139,7 +139,9 @@ MySQLConnectionParameters MySQLUtils::ParseConnectionParameters(const string &ds
 			} else if (val == "preferred") {
 				result.ssl_mode = SSL_MODE_PREFERRED;
 			} else {
-				throw InvalidInputException("Invalid dsn - ssl mode must be either disabled, required, verify_ca, verify_identity or preferred - got %s", value);
+				throw InvalidInputException("Invalid dsn - ssl mode must be either disabled, required, verify_ca, "
+				                            "verify_identity or preferred - got %s",
+				                            value);
 			}
 		} else if (key == "ssl_ca") {
 			set_options.insert("ssl_ca");

src/storage/mysql_execute_query.cpp

@@ -92,6 +92,20 @@ string ExtractFilters(PhysicalOperator &child, const string &statement) {
 		} else {
 			return result + " AND " + filter_str;
 		}
+	} else if (child.type == PhysicalOperatorType::PROJECTION) {
+		auto &proj = child.Cast<PhysicalProjection>();
+		for (auto &expr : proj.select_list) {
+			switch (expr->type) {
+			case ExpressionType::BOUND_REF:
+			case ExpressionType::BOUND_COLUMN_REF:
+			case ExpressionType::VALUE_CONSTANT:
+				break;
+			default:
+				throw NotImplementedException("Unsupported expression type in projection - only simple deletes/updates "
+				                              "are supported in the MySQL connector");
+			}
+		}
+		return ExtractFilters(*child.children[0], statement);
 	} else if (child.type == PhysicalOperatorType::TABLE_SCAN) {
 		auto &table_scan = child.Cast<PhysicalTableScan>();
 		if (!table_scan.table_filters) {