Warnings (#1378)

flake.nix

@@ -13,6 +13,7 @@
 
     edgedb = {
       url = "github:edgedb/packages-nix";
+      inputs.fenix.follows = "fenix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-parts.follows = "flake-parts";
     };
@@ -27,8 +28,7 @@
 
           common = [
             # needed for running tests
-            # edgedb.packages.${system}.edgedb-server
-            edgedb.packages.${system}.edgedb-server-5_0_beta
+            edgedb.packages.${system}.edgedb-server-nightly
           ] ++ pkgs.lib.optional pkgs.stdenv.isDarwin [
             pkgs.libiconv
             pkgs.darwin.apple_sdk.frameworks.CoreServices

src/branch/connections.rs

@@ -22,12 +22,11 @@ impl BranchConnection<'_> {
             )
             .await?;
 
-            print::completion(
-                branch
-                    .connection
-                    .execute(&format!("drop branch {} force", self.branch_name), &())
-                    .await?,
-            );
+            let (status, _warnings) = branch
+                .connection
+                .execute(&format!("drop branch {} force", self.branch_name), &())
+                .await?;
+            print::completion(status);
 
             // should never happen, but just to make sure
             if branch.is_temp {

src/branch/create.rs

@@ -49,7 +49,7 @@ pub async fn create_branch(
         format!("create {kind} branch {new_branch} from {from}")
     };
 
-    let status = connection.execute(&query, &()).await?;
+    let (status, _warnings) = connection.execute(&query, &()).await?;
     print::completion(status);
     Ok(())
 }

src/branch/drop.rs

@@ -39,7 +39,7 @@ pub async fn main(
         statement = format!("{} force", &statement);
     }
 
-    let status = connection.execute(&statement, &()).await?;
+    let (status, _warnings) = connection.execute(&statement, &()).await?;
 
     print::completion(status);
 

src/branch/rebase.rs

@@ -47,7 +47,7 @@ pub async fn main(
             eprintln!("Cleaning up cloned branch...");
             let mut rename_connection =
                 get_connection_to_modify(&temp_branch, cli_opts, source_connection).await?;
-            let result = rename_connection
+            let (status, _warnings) = rename_connection
                 .connection
                 .execute(
                     &format!(
@@ -58,7 +58,7 @@ pub async fn main(
                 )
                 .await?;
 
-            print::completion(result);
+            print::completion(status);
 
             rename_connection.clean().await
         }
@@ -88,7 +88,7 @@ async fn rebase(
 
     // drop source branch
     eprintln!("\nReplacing '{}' with rebased version...", current_branch);
-    let status = target_connection
+    let (status, _warnings) = target_connection
         .execute(
             &format!(
                 "drop branch {} force",
@@ -112,7 +112,7 @@ async fn rename_temp_to_source(
 ) -> anyhow::Result<()> {
     let mut rename_connection = get_connection_to_modify(temp_branch, options, connection).await?;
 
-    let status = rename_connection
+    let (status, _warnings) = rename_connection
         .connection
         .execute(
             &format!(
@@ -136,7 +136,7 @@ async fn clone_target_branch(branch: &str, connection: &mut Connection) -> anyho
 
     let temp_branch_name = Uuid::new_v4().to_string();
 
-    let status = connection
+    let (status, _warnings) = connection
         .execute(
             &format!(
                 "create data branch {} from {}",

src/branch/rename.rs

@@ -38,7 +38,7 @@ pub async fn main(
 }
 
 async fn rename(connection: &mut Connection, options: &Rename) -> anyhow::Result<()> {
-    let status = connection
+    let (status, _warnings) = connection
         .execute(
             &format!(
                 "alter branch {0}{2} rename to {1}",

src/branch/wipe.rs

@@ -31,7 +31,7 @@ pub async fn main(
         }
     }
 
-    let status = connection.execute("RESET SCHEMA TO initial", &()).await?;
+    let (status, _warnings) = connection.execute("RESET SCHEMA TO initial", &()).await?;
 
     print::completion(status);
 

src/commands/configure.rs

@@ -14,7 +14,8 @@ async fn set(
 ) -> Result<(), anyhow::Error> {
     let cast = cast.unwrap_or_default();
     let query = format!("CONFIGURE INSTANCE SET {name} := {cast}{value}");
-    print::completion(&cli.execute(&query, &()).await?);
+    let (status, _warnings) = cli.execute(&query, &()).await?;
+    print::completion(&status);
     Ok(())
 }
 
@@ -54,8 +55,8 @@ pub async fn configure(
             if let Some(ref comment_text) = comment {
                 props.push(format!("comment := {}", quote_string(comment_text)))
             }
-            print::completion(
-                &cli.execute(
+            let (status, _warnings) = cli
+                .execute(
                     &format!(
                         r###"
                 CONFIGURE INSTANCE INSERT Auth {{
@@ -66,8 +67,8 @@ pub async fn configure(
                     ),
                     &(),
                 )
-                .await?,
-            );
+                .await?;
+            print::completion(&status);
             Ok(())
         }
         C::Set(Set {
@@ -78,25 +79,25 @@ pub async fn configure(
                 .map(|x| quote_string(x))
                 .collect::<Vec<_>>()
                 .join(", ");
-            print::completion(
-                &cli.execute(
+            let (status, _warnings) = cli
+                .execute(
                     &format!("CONFIGURE INSTANCE SET listen_addresses := {{{addresses}}}"),
                     &(),
                 )
-                .await?,
-            );
+                .await?;
+            print::completion(&status);
             Ok(())
         }
         C::Set(Set {
             parameter: S::ListenPort(param),
         }) => {
-            print::completion(
-                &cli.execute(
+            let (status, _warnings) = cli
+                .execute(
                     &format!("CONFIGURE INSTANCE SET listen_port := {}", param.port),
                     &(),
                 )
-                .await?,
-            );
+                .await?;
+            print::completion(&status);
             Ok(())
         }
         C::Set(Set {
@@ -167,13 +168,13 @@ pub async fn configure(
                 .map(|x| quote_string(x))
                 .collect::<Vec<_>>()
                 .join(", ");
-            print::completion(
-                &cli.execute(
+            let (status, _warnings) = cli
+                .execute(
                     &format!("CONFIGURE INSTANCE SET cors_allow_origins := {{{values}}}"),
                     &(),
                 )
-                .await?,
-            );
+                .await?;
+            print::completion(&status);
             Ok(())
         }
         C::Set(Set {
@@ -220,10 +221,10 @@ pub async fn configure(
                 C::StoreMigrationSdl => "store_migration_sdl",
                 C::NetHttpMaxConnections => "net_http_max_connections",
             };
-            print::completion(
-                &cli.execute(&format!("CONFIGURE INSTANCE RESET {name}"), &())
-                    .await?,
-            );
+            let (status, _warnings) = cli
+                .execute(&format!("CONFIGURE INSTANCE RESET {name}"), &())
+                .await?;
+            print::completion(&status);
             Ok(())
         }
     }