pr fixes - spelling + metric as the last column everywhere

Author: Jamesbarford

collector/src/compile/benchmark/target.rs

@@ -1,16 +1,16 @@
-/// Target representing an Rust target tripple, for a full list of targets and 
+/// Target representing an Rust target triple, for a full list of targets and
 /// their support see;
 /// https://doc.rust-lang.org/nightly/rustc/platform-support.html
 ///
 /// Presently we only support x86_64
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, serde::Deserialize)]
 pub enum Target {
     /// `x86_64-unknown-linux-gnu`
-    X86_64UnknownLinuxGnu
+    X86_64UnknownLinuxGnu,
 }
 
- impl Default for Target {
+impl Default for Target {
     fn default() -> Self {
         Self::X86_64UnknownLinuxGnu
-   }
+    }
 }

database/schema.md

@@ -152,9 +152,9 @@ many times in the `pstat` table.
 
 ```
 sqlite> select * from pstat_series limit 1;
-id          crate       profile     scenario    backend  metric        target
-----------  ----------  ----------  ----------  -------  ------------  ------------
-1           helloworld  check       full        llvm     task-clock:u  x86_64-linux-unknown-gnu
+id          crate       profile     scenario    backend  target                    metric      
+----------  ----------  ----------  ----------  -------  ------------              ------------
+1           helloworld  check       full        llvm     x86_64-linux-unknown-gnu  task-clock:u
 ```
 
 ### pstat

database/src/lib.rs

@@ -340,7 +340,7 @@ impl PartialOrd for Scenario {
     }
 }
 
-/// Target representing an Rust target tripple, for a full list of targets and 
+/// Target representing an Rust target triple, for a full list of targets and
 /// their support see;
 /// https://doc.rust-lang.org/nightly/rustc/platform-support.html
 ///
@@ -350,7 +350,7 @@ impl PartialOrd for Scenario {
 )]
 pub enum Target {
     /// `x86_64-unknown-linux-gnu`
-    X86_64UnknownLinuxGnu
+    X86_64UnknownLinuxGnu,
 }
 
 impl Target {
@@ -630,8 +630,8 @@ pub enum DbLabel {
         profile: Profile,
         scenario: Scenario,
         backend: CodegenBackend,
-        metric: Metric,
         target: Target,
+        metric: Metric,
     },
 }
 
@@ -703,7 +703,7 @@ impl Index {
         self.pstat_series
             .map
             .keys()
-            .map(|(_, _, _, _, metric, _)| metric)
+            .map(|(_, _, _, _, _, metric)| metric)
             .collect::<std::collections::HashSet<_>>()
             .into_iter()
             .map(|s| s.to_string())

database/src/pool/postgres.rs

@@ -637,8 +637,8 @@ where
                             Profile::from_str(row.get::<_, String>(2).as_str()).unwrap(),
                             row.get::<_, String>(3).as_str().parse().unwrap(),
                             CodegenBackend::from_str(row.get::<_, String>(4).as_str()).unwrap(),
-                            Target::from_str(row.get::<_, String>(6).as_str()).unwrap(),
-                            row.get::<_, String>(5).as_str().into(),
+                            Target::from_str(row.get::<_, String>(5).as_str()).unwrap(),
+                            row.get::<_, String>(6).as_str().into(),
                         ),
                     )
                 })

database/src/pool/sqlite.rs

@@ -387,21 +387,22 @@ static MIGRATIONS: &[Migration] = &[
     ),
     // Add target as a unique constraint, defaulting to 'x86_64-unknown-linux-gnu'
     Migration::without_foreign_key_constraints(
-    r#"
+        r#"
         create table pstat_series_with_target(
             id integer primary key not null,
             crate text not null references benchmark(name) on delete cascade on update cascade,
             profile text not null,
             scenario text not null,
             backend text not null,
-            metric text not null,
             target text not null default 'x86_64-unknown-linux-gnu',
+            metric text not null,
             UNIQUE(crate, profile, scenario, backend, target, metric)
         );
-        insert into pstat_series_with_target select id, crate, profile, scenario, backend, metric, 'x86_64-unknown-linux-gnu' from pstat_series;
+        insert into pstat_series_with_target select id, crate, profile, scenario, backend, 'x86_64-unknown-linux-gnu', metric from pstat_series;
         drop table pstat_series;
         alter table pstat_series_with_target rename to pstat_series;
-    "#),
+    "#,
+    ),
 ];
 
 #[async_trait::async_trait]
@@ -517,7 +518,9 @@ impl Connection for SqliteConnection {
             .collect();
         let pstat_series = self
             .raw()
-            .prepare("select id, crate, profile, scenario, backend, target, metric from pstat_series;")
+            .prepare(
+                "select id, crate, profile, scenario, backend, target, metric from pstat_series;",
+            )
             .unwrap()
             .query_map(params![], |row| {
                 Ok((