From 15a15c123e4c69292bf7bb35613cc02b3f9e21f1 Mon Sep 17 00:00:00 2001
From: Gurpreet Singh <gdhuper@users.noreply.github.com>
Date: Wed, 7 Jun 2023 10:08:21 -0700
Subject: [PATCH] Add a check for empty params for `url join` (#9356)

# Description
<!--
Thank you for improving Nushell. Please, check our [contributing
guide](../CONTRIBUTING.md) and talk to the core team before making major
changes.

Description of your pull request goes here. **Provide examples and/or
screenshots** if your changes affect the user experience.
-->

Fix for #9347

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the
standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->
- [x] Add unit tests
- [x] Run all cargo tests + fmt commands

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
---
 crates/nu-command/src/network/url/join.rs    |  6 +++++-
 crates/nu-command/tests/commands/url/join.rs | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/crates/nu-command/src/network/url/join.rs b/crates/nu-command/src/network/url/join.rs
index 8e1a745499..46ecc740c2 100644
--- a/crates/nu-command/src/network/url/join.rs
+++ b/crates/nu-command/src/network/url/join.rs
@@ -191,7 +191,11 @@ impl UrlComponents {
                         .collect::<Result<Vec<String>, ShellError>>()?
                         .join("&");
 
-                    qs = format!("?{qs}");
+                    qs = if !qs.trim().is_empty() {
+                        format!("?{qs}")
+                    } else {
+                        qs
+                    };
 
                     if let Some(q) = self.query {
                         if q != qs {
diff --git a/crates/nu-command/tests/commands/url/join.rs b/crates/nu-command/tests/commands/url/join.rs
index cd10916ffb..5198228f0e 100644
--- a/crates/nu-command/tests/commands/url/join.rs
+++ b/crates/nu-command/tests/commands/url/join.rs
@@ -366,3 +366,21 @@ fn url_join_with_fragment_and_params() {
         "http://usr:pwd@localhost:1234?par_1=aaa&par_2=bbb#frag"
     );
 }
+
+#[test]
+fn url_join_with_empty_params() {
+    let actual = nu!(
+        cwd: ".", pipeline(
+            r#"
+            {
+                "scheme": "https",
+                "host": "localhost",
+                "path": "/foo",
+                "params": {}
+            } | url join
+            "#
+        )
+    );
+
+    assert_eq!(actual.out, "https://localhost/foo");
+}