Merge remote-tracking branch 'upstream/main' into add-hidden-query-button

Signed-off-by: OrReuben <orreuven1243@gmail.com>

Author: OrReuben

cue-test/common/proxy/sql.cue

@@ -0,0 +1,25 @@
+// Copyright The Perses Authors
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package proxy
+
+mySQLProxySpec: #baseSQLDatasourceSpec & {
+	proxy: #SQLProxy & {
+		kind: "SQLProxy"
+		spec: {
+			driver: "postgres"
+			host: "localhost:5432"
+			database: "mydb"
+		}
+	}
+}

cue/common/proxy/sql.cue

@@ -46,7 +46,7 @@ import (
 #SQLProxy: {
 	kind: "SQLProxy"
 	spec: {
-		driver: "mysql" | "postgres"
+		driver: "mysql" | "mariadb" | "postgres"
 		// host is the hostname and port of the datasource. It is not the hostname of the proxy.
 		// The Perses server is the proxy, so it needs to know where to redirect the request.
 		host: string
@@ -57,7 +57,11 @@ import (
 		secret?: string
 		// mysql specific driver configurations
 		mysql?: #MySQL
+		// mariadb specific driver configurations
+		mariadb?: #MySQL
 		// postgres specific driver configurations
 		postgres?: #Postgres
 	}
 }
+
+#baseSQLDatasourceSpec: { driver: "mysql" | "mariadb" | "postgres", host: string, database: string }| { proxy: #SQLProxy }