Fix/Refactor the "Add data" forms

runtime/drivers/athena/athena.go

@@ -19,6 +19,18 @@ var spec = drivers.Spec{
 	DisplayName: "Amazon Athena",
 	Description: "Connect to Amazon Athena database.",
 	DocsURL:     "",
+	ConfigProperties: []*drivers.PropertySpec{
+		{
+			Key:    "aws_access_key_id",
+			Type:   drivers.StringPropertyType,
+			Secret: true,
+		},
+		{
+			Key:    "aws_secret_access_key",
+			Type:   drivers.StringPropertyType,
+			Secret: true,
+		},
+	},
 	SourceProperties: []*drivers.PropertySpec{
 		{
 			Key:         "sql",
@@ -52,17 +64,13 @@ var spec = drivers.Spec{
 			Placeholder: "us-east-1",
 			Required:    false,
 		},
-	},
-	ConfigProperties: []*drivers.PropertySpec{
-		{
-			Key:    "aws_access_key_id",
-			Type:   drivers.StringPropertyType,
-			Secret: true,
-		},
 		{
-			Key:    "aws_secret_access_key",
-			Type:   drivers.StringPropertyType,
-			Secret: true,
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
 		},
 	},
 }

runtime/drivers/azure/azure.go

@@ -74,6 +74,14 @@ var spec = drivers.Spec{
 			Description: "Azure storage account name.",
 			Required:    false,
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsObjectStore: true,
 }

runtime/drivers/bigquery/bigquery.go

@@ -49,6 +49,14 @@ var spec = drivers.Spec{
 			Placeholder: "my-project",
 			Hint:        "Rill will use the project ID from your local credentials, unless set here. Set this if no project ID configured in credentials.",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 		{
 			Key:         "google_application_credentials",
 			Type:        drivers.InformationalPropertyType,

runtime/drivers/clickhouse/clickhouse.go

@@ -34,42 +34,6 @@ var spec = drivers.Spec{
 			Placeholder: "clickhouse://localhost:9000?username=default&password=",
 			NoPrompt:    true,
 		},
-		{
-			Key:         "host",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "host",
-			Required:    false,
-			Placeholder: "localhost",
-		},
-		{
-			Key:         "port",
-			Type:        drivers.NumberPropertyType,
-			DisplayName: "port",
-			Required:    false,
-			Placeholder: "9000",
-		},
-		{
-			Key:         "username",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "username",
-			Required:    false,
-			Placeholder: "default",
-		},
-		{
-			Key:         "password",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "password",
-			Required:    false,
-			Secret:      true,
-		},
-		{
-			Key:         "ssl",
-			Type:        drivers.BooleanPropertyType,
-			DisplayName: "ssl",
-			Required:    false,
-		},
-	},
-	SourceProperties: []*drivers.PropertySpec{
 		{
 			Key:         "host",
 			Type:        drivers.StringPropertyType,

runtime/drivers/druid/druid.go

@@ -36,40 +36,6 @@ var spec = drivers.Spec{
 			Secret:      true,
 			NoPrompt:    true,
 		},
-		{
-			Key:         "host",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "host",
-			Required:    false,
-		},
-		{
-			Key:         "port",
-			Type:        drivers.NumberPropertyType,
-			DisplayName: "port",
-			Required:    false,
-			Placeholder: "8888",
-		},
-		{
-			Key:         "username",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "username",
-			Required:    false,
-		},
-		{
-			Key:         "password",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "password",
-			Required:    false,
-			Secret:      true,
-		},
-		{
-			Key:         "ssl",
-			Type:        drivers.BooleanPropertyType,
-			DisplayName: "ssl",
-			Required:    false,
-		},
-	},
-	SourceProperties: []*drivers.PropertySpec{
 		{
 			Key:         "host",
 			Type:        drivers.StringPropertyType,

runtime/drivers/duckdb/duckdb.go

@@ -46,8 +46,12 @@ var spec = drivers.Spec{
 	DocsURL:     "https://docs.rilldata.com/reference/connectors/motherduck",
 	ConfigProperties: []*drivers.PropertySpec{
 		{
-			Key:  "path",
-			Type: drivers.StringPropertyType,
+			Key:         "path",
+			Type:        drivers.StringPropertyType,
+			Required:    true,
+			DisplayName: "Path",
+			Description: "Path to external DuckDB database.",
+			Placeholder: "/path/to/main.db",
 		},
 	},
 	SourceProperties: []*drivers.PropertySpec{
@@ -56,8 +60,24 @@ var spec = drivers.Spec{
 			Type:        drivers.StringPropertyType,
 			Required:    true,
 			DisplayName: "DB",
-			Description: "Path to external DuckDB database. Use md:<dbname> for motherduckb.",
-			Placeholder: "/path/to/main.db or md:main.db(for motherduck)",
+			Description: "Path to DuckDB database",
+			Placeholder: "/path/to/duckdb.db",
+		},
+		{
+			Key:         "sql",
+			Type:        drivers.StringPropertyType,
+			Required:    true,
+			DisplayName: "SQL",
+			Description: "Query to extract data from DuckDB.",
+			Placeholder: "select * from table;",
+		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
 		},
 	},
 	ImplementsCatalog: true,

runtime/drivers/gcs/gcs.go

@@ -50,6 +50,14 @@ var spec = drivers.Spec{
 			Required:    true,
 			Hint:        "Glob patterns are supported",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 		{
 			Key:         "gcp.credentials",
 			Type:        drivers.InformationalPropertyType,

runtime/drivers/https/https.go

@@ -32,6 +32,14 @@ var spec = drivers.Spec{
 			Placeholder: "https://example.com/file.csv",
 			Required:    true,
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsFileStore: true,
 }

runtime/drivers/mysql/mysql.go

@@ -43,6 +43,14 @@ var spec = drivers.Spec{
 			Placeholder: "username:password@tcp(example.com:3306)/my-db",
 			Hint:        "Either set this or pass --var connector.mysql.dsn=... to rill start",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsSQLStore: true,
 }

runtime/drivers/pinot/pinot.go

@@ -32,42 +32,6 @@ var spec = drivers.Spec{
 			Secret:      true,
 			NoPrompt:    true,
 		},
-		{
-			Key:         "host",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "host",
-			Required:    false,
-		},
-		{
-			Key:         "port",
-			Type:        drivers.NumberPropertyType,
-			DisplayName: "port",
-			Required:    false,
-			Placeholder: "9000",
-		},
-		{
-			Key:         "username",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "username",
-			Required:    false,
-			Placeholder: "username",
-		},
-		{
-			Key:         "password",
-			Type:        drivers.StringPropertyType,
-			DisplayName: "password",
-			Required:    false,
-			Secret:      true,
-		},
-		{
-			Key:         "ssl",
-			Type:        drivers.BooleanPropertyType,
-			DisplayName: "ssl",
-			Required:    false,
-			Default:     "true",
-		},
-	},
-	SourceProperties: []*drivers.PropertySpec{
 		{
 			Key:         "host",
 			Type:        drivers.StringPropertyType,

runtime/drivers/postgres/postgres.go

@@ -41,6 +41,14 @@ var spec = drivers.Spec{
 			Placeholder: "postgresql://postgres:postgres@localhost:5432/postgres",
 			Hint:        "Either set this or pass --var connector.postgres.database_url=... to rill start",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsSQLStore: true,
 }

runtime/drivers/redshift/redshift.go

@@ -88,6 +88,14 @@ var spec = drivers.Spec{
 			Placeholder: "arn:aws:iam::03214372:role/service-role/AmazonRedshift-CommandsAccessRole-20240307T203902",
 			Required:    true,
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsSQLStore: true,
 }

runtime/drivers/s3/s3.go

@@ -69,6 +69,14 @@ var spec = drivers.Spec{
 			Required:    false,
 			Hint:        "Overrides the S3 endpoint to connect to. This should only be used to connect to S3-compatible services, such as Cloudflare R2 or MinIO.",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 		{
 			Key:         "aws.credentials",
 			Type:        drivers.InformationalPropertyType,

runtime/drivers/salesforce/salesforce.go

@@ -114,6 +114,14 @@ var spec = drivers.Spec{
 			Default:     defaultClientID,
 			Hint:        "Either set this or pass --var connector.salesforce.client_id=... to rill start",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsSQLStore: true,
 }

runtime/drivers/snowflake/snowflake.go

@@ -43,6 +43,14 @@ var spec = drivers.Spec{
 			Placeholder: "my_user_name:my_password@ac123456/my_database/my_schema?warehouse=my_warehouse&role=my_user_role",
 			Hint:        "Either set this or pass --var connector.snowflake.dsn=... to rill start",
 		},
+		{
+			Key:         "name",
+			Type:        drivers.StringPropertyType,
+			DisplayName: "Source name",
+			Description: "The name of the source",
+			Placeholder: "my_new_source",
+			Required:    true,
+		},
 	},
 	ImplementsSQLStore: true,
 }

runtime/drivers/sqlite/sqlite.go

@@ -61,7 +61,7 @@ func (d driver) Spec() drivers.Spec {
 				Required:    true,
 				DisplayName: "DB",
 				Description: "Path to SQLite db file",
-				Placeholder: "sqlite.db",
+				Placeholder: "/path/to/sqlite.db",
 			},
 			{
 				Key:         "table",
@@ -71,6 +71,14 @@ func (d driver) Spec() drivers.Spec {
 				Description: "SQLite table name",
 				Placeholder: "table",
 			},
+			{
+				Key:         "name",
+				Type:        drivers.StringPropertyType,
+				DisplayName: "Source name",
+				Description: "The name of the source",
+				Placeholder: "my_new_source",
+				Required:    true,
+			},
 		},
 		ImplementsRegistry: true,
 		ImplementsCatalog:  true,