fix: set withHistory flag to true for non-interactive mode (#107263)

pkg/cmd/grafana-cli/commands/datamigrations/to_unified_storage.go

@@ -85,6 +85,7 @@ func ToUnifiedStorage(c utils.CommandLine, cfg *setting.Cfg, sqlStore db.DB) err
 	if c.Bool("non-interactive") {
 		opts.Store = client
 		opts.BlobStore = client
+		opts.WithHistory = true // always include history in non-interactive mode
 		rsp, err := migrator.Migrate(ctx, opts)
 		if exitErr := handleMigrationError(err, rsp); exitErr != nil {
 			return exitErr

pkg/registry/apis/dashboard/legacy/query_dashboards.sql

@@ -1,20 +1,33 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
+  created_user.uid         as created_by,
+  dashboard.created_by     as created_by_id,
   {{ if .Query.UseHistoryTable }}
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  dashboard_version.created,
-  dashboard_version.version, dashboard_version.message, 
+  updated_user.uid       as updated_by,
-  dashboard_version.data, dashboard_version.api_version
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
   {{ else }}
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  dashboard.updated,
-  dashboard.version, '' as message, 
+  updated_user.uid       as updated_by,
-  dashboard.data, dashboard.api_version
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
   {{ end }}
 FROM {{ .Ident .DashboardTable }} as dashboard
 {{ if .Query.UseHistoryTable }}
@@ -39,15 +52,15 @@ WHERE dashboard.is_folder = {{ .Arg .Query.GetFolders }}
     dashboard_version.version {{ .Query.Order }},
     dashboard.uid ASC
   {{ else }}
-    {{ if .Query.UID }}
+  {{ if .Query.UID }}
-    AND dashboard.uid = {{ .Arg .Query.UID }}
+  AND dashboard.uid = {{ .Arg .Query.UID }}
-    {{ else if .Query.LastID }}
+  {{ else if .Query.LastID }}
-    AND dashboard.id < {{ .Arg .Query.LastID }}
+  AND dashboard.id < {{ .Arg .Query.LastID }}
-    {{ end }}
+  {{ end }}
-    {{ if .Query.GetTrash }}
+  {{ if .Query.GetTrash }}
-    AND dashboard.deleted IS NOT NULL
+  AND dashboard.deleted IS NOT NULL
-    {{ else }}
+  {{ else }}
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
-    {{ end }}
+  {{ end }}
   ORDER BY dashboard.id DESC
   {{ end }}

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-dashboard_next_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.id < 22
+  AND dashboard.id < 22
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-export_with_history.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_version` as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-folders.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = TRUE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_at_version.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_version` as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/mysql--query_dashboards-history_uid_second_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM `grafana`.`dashboard` as dashboard
 LEFT OUTER JOIN `grafana`.`dashboard_provisioning` as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN `grafana`.`user` as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN `grafana`.`user` as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-dashboard_next_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.id < 22
+  AND dashboard.id < 22
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-export_with_history.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-folders.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = TRUE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_at_version.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/postgres--query_dashboards-history_uid_second_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-dashboard_next_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.id < 22
+  AND dashboard.id < 22
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-export_with_history.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-folders.sql

@@ -1,20 +1,29 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = TRUE
   AND dashboard.org_id = 2
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_at_version.sql

@@ -1,15 +1,24 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard_version.created, updated_user.uid as updated_by,updated_user.id as created_by_id,
+  created_user.uid         as created_by,
-  dashboard_version.version, dashboard_version.message, 
+  dashboard.created_by     as created_by_id,
-  dashboard_version.data, dashboard_version.api_version
+  dashboard_version.created,
+  updated_user.uid       as updated_by,
+  updated_user.id        as created_by_id,
+  dashboard_version.version,
+  dashboard_version.message,
+  dashboard_version.data,
+  dashboard_version.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_version" as dashboard_version ON dashboard.id = dashboard_version.dashboard_id
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id

pkg/registry/apis/dashboard/legacy/testdata/sqlite--query_dashboards-history_uid_second_page.sql

@@ -1,21 +1,30 @@
 SELECT
-  dashboard.org_id, dashboard.id,
+  dashboard.org_id,
-  dashboard.uid, dashboard.folder_uid,
+  dashboard.id,
-  dashboard.deleted, plugin_id,
+  dashboard.uid,
+  dashboard.folder_uid,
+  dashboard.deleted,
+  plugin_id,
   provisioning.name        as repo_name,
   provisioning.external_id as repo_path,
   provisioning.check_sum   as repo_hash,
   provisioning.updated     as repo_ts,
-  dashboard.created, created_user.uid as created_by, dashboard.created_by   as created_by_id,
+  dashboard.created,
-  dashboard.updated, updated_user.uid as updated_by, dashboard.updated_by   as updated_by_id,
+  created_user.uid         as created_by,
-  dashboard.version, '' as message, 
+  dashboard.created_by     as created_by_id,
-  dashboard.data, dashboard.api_version
+  dashboard.updated,
+  updated_user.uid       as updated_by,
+  dashboard.updated_by   as updated_by_id,
+  dashboard.version,
+  '' as message,
+  dashboard.data,
+  dashboard.api_version
 FROM "grafana"."dashboard" as dashboard
 LEFT OUTER JOIN "grafana"."dashboard_provisioning" as provisioning ON dashboard.id = provisioning.dashboard_id
 LEFT OUTER JOIN "grafana"."user" as created_user ON dashboard.created_by = created_user.id
 LEFT OUTER JOIN "grafana"."user" as updated_user ON dashboard.updated_by = updated_user.id
 WHERE dashboard.is_folder = FALSE
   AND dashboard.org_id = 2
-    AND dashboard.uid = 'UUU'
+  AND dashboard.uid = 'UUU'
-    AND dashboard.deleted IS NULL
+  AND dashboard.deleted IS NULL
   ORDER BY dashboard.id DESC