test fixes

Author: k-anshul

runtime/drivers/registry.go

@@ -57,6 +57,8 @@ type Instance struct {
 	// ProjectVariables contains default variables from rill.yaml
 	// (NOTE: This can always be reproduced from rill.yaml, so it's really just a handy cache of the values.)
 	ProjectVariables map[string]string `db:"project_variables"`
+	// PresetConfigs contains preset InstanceConfig for the instance.
+	PresetConfigs map[string]string `db:"preset_configs"`
 	// FeatureFlags contains feature flags configured in rill.yaml
 	FeatureFlags map[string]string `db:"feature_flags"`
 	// Annotations to enrich activity events (like usage tracking)
@@ -71,8 +73,6 @@ type Instance struct {
 	FrontendURL string `db:"frontend_url"`
 	// Theme is the name of the theme resource to use for AI-generated charts.
 	Theme string `db:"theme"`
-	// PresetConfigs contains preset InstanceConfig for the instance.
-	PresetConfigs map[string]string `db:"preset_configs"`
 }
 
 // InstanceConfig contains dynamic configuration for an instance.

runtime/drivers/registry_test.go

@@ -80,3 +80,27 @@ func testRegistry(t *testing.T, reg drivers.RegistryStore) {
 	require.NoError(t, err)
 	require.Equal(t, 1, len(insts))
 }
+
+func TestInstanceConfig_PresetConfigsOverrideVariables(t *testing.T) {
+	inst := &drivers.Instance{
+		Variables: map[string]string{
+			"rill.download_limit_bytes":      "100",
+			"rill.interactive_sql_row_limit": "200",
+		},
+		PresetConfigs: map[string]string{
+			"rill.download_limit_bytes":   "300",
+			"rill.model.timeout_override": "400",
+		},
+	}
+
+	config, err := inst.Config()
+	require.NoError(t, err)
+
+	// Variables are applied before preset configs, so overlapping preset values win.
+	require.Equal(t, int64(300), config.DownloadLimitBytes)
+	require.Equal(t, int64(200), config.InteractiveSQLRowLimit)
+	require.Equal(t, uint32(400), config.ModelTimeoutOverride)
+
+	// Unrelated defaults should still remain intact.
+	require.Equal(t, uint32(5), config.ModelConcurrentExecutionLimit)
+}

runtime/drivers/sqlite/backups.go

@@ -38,7 +38,7 @@ var (
 		// Table `instances`.
 		// It excludes the JSON columns due to a type mess up: the columns are TEXT, but we've been saving BLOB values to them.
 		// SQLite weirdly allows this, but DuckDB chokes on it.
-		"instances": "SELECT * EXCLUDE (variables, project_variables, feature_flags, annotations, connectors, project_connectors, public_paths) FROM instances",
+		"instances": "SELECT * EXCLUDE (variables, project_variables, feature_flags, annotations, connectors, project_connectors, public_paths, preset_configs) FROM instances",
 		// Table `instance_health`
 		"instance_health": "SELECT * FROM instance_health",
 		// Table `catalogv2` (NOTE: the `data` column has already been converted to JSON in rewriteSnapshotForAnalytics below).

runtime/server/instances.go

@@ -112,9 +112,9 @@ func (s *Server) CreateInstance(ctx context.Context, req *runtimev1.CreateInstan
 		AIConnector:    req.AiConnector,
 		Connectors:     req.Connectors,
 		Variables:      req.Variables,
+		PresetConfigs:  req.PresetConfig,
 		Annotations:    req.Annotations,
 		FrontendURL:    req.FrontendUrl,
-		PresetConfigs:  req.PresetConfig,
 	}
 
 	err := s.runtime.CreateInstance(ctx, inst)