From 1086fbe9b5ef588fb6fda5f09133fb72fc2e2fb7 Mon Sep 17 00:00:00 2001
From: Reilly Wood <26268125+rgwood@users.noreply.github.com>
Date: Sun, 31 Jul 2022 12:36:14 -0700
Subject: [PATCH] Revert `query` command to `query db` (#6200)

---
 crates/nu-command/src/database/commands/query.rs | 10 +++++-----
 crates/nu-command/tests/commands/query/db.rs     |  8 +++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/crates/nu-command/src/database/commands/query.rs b/crates/nu-command/src/database/commands/query.rs
index 496f213195c5..9ec8c16fd09a 100644
--- a/crates/nu-command/src/database/commands/query.rs
+++ b/crates/nu-command/src/database/commands/query.rs
@@ -13,17 +13,17 @@ pub struct QueryDb;
 
 impl Command for QueryDb {
     fn name(&self) -> &str {
-        "query"
+        "query db"
     }
 
     fn signature(&self) -> Signature {
         Signature::build(self.name())
             .required(
-                "query",
+                "SQL",
                 SyntaxShape::String,
                 "SQL to execute against the database",
             )
-            .input_type(Type::Custom("database".into()))
+            .input_type(Type::Any)
             .output_type(Type::Any)
             .category(Category::Custom("database".into()))
     }
@@ -34,8 +34,8 @@ impl Command for QueryDb {
 
     fn examples(&self) -> Vec<Example> {
         vec![Example {
-            description: "Execute a query statement using the database connection",
-            example: r#"open foo.db | into db | query "SELECT * FROM Bar""#,
+            description: "Execute SQL against a SQLite database",
+            example: r#"open foo.db | query db "SELECT * FROM Bar""#,
             result: None,
         }]
     }
diff --git a/crates/nu-command/tests/commands/query/db.rs b/crates/nu-command/tests/commands/query/db.rs
index b84b5cb8f836..188efa19e4cb 100644
--- a/crates/nu-command/tests/commands/query/db.rs
+++ b/crates/nu-command/tests/commands/query/db.rs
@@ -7,8 +7,7 @@ fn can_query_single_table() {
         cwd: "tests/fixtures/formats", pipeline(
         r#"
             open sample.db
-            | into db
-            | query "select * from strings"
+            | query db "select * from strings"
             | where x =~ ell
             | length
         "#
@@ -24,8 +23,7 @@ fn invalid_sql_fails() {
         cwd: "tests/fixtures/formats", pipeline(
         r#"
             open sample.db
-            | into db
-            | query "select *asdfasdf"
+            | query db "select *asdfasdf"
         "#
     ));
 
@@ -38,7 +36,7 @@ fn invalid_input_fails() {
     let actual = nu!(
     cwd: "tests/fixtures/formats", pipeline(
         r#"
-            "foo" | into db | query "select * from asdf"
+            "foo" | query db "select * from asdf"
         "#
     ));