Validating CLI arguments

src/sql/magic.py

@@ -188,9 +188,14 @@ def check_random_arguments(self, line="", cell=""):
 
         # Iterate through the tokens to separate arguments and SQL code
         # If the token starts with "--", it is an argument
+        breakLoop = False
         for token in tokens:
             if token.startswith("--"):
                 arguments.append(token)
+                breakLoop = True
+            else:
+                if breakLoop:
+                    break
 
         declared_argument = _option_strings_from_parser(SqlMagic.execute.parser)
         # check only for cell magic

src/tests/test_magic.py

@@ -187,8 +187,17 @@ def test_persist_no_index(ip):
     assert persisted == [(1, "foo"), (2, "bar")]
 
 
-def test_unrecognized_arguments_cell_magic(ip):
-    result = ip.run_cell("%%sql --stuff \n SELECT * FROM test")
+@pytest.mark.parametrize(
+    "sql_statement",
+    [
+        "%%sql --stuff\n SELECT * FROM test",
+        "%%sql --unknown\n SELECT * FROM test",
+        "%%sql --invalid-arg\n SELECT * FROM test",
+        "%sql select * from penguins.csv limit --some sql comment",
+    ],
+)
+def test_unrecognized_arguments_cell_magic(ip, sql_statement):
+    result = ip.run_cell(sql_statement)
     assert "Unrecognized argument(s)" in str(result.error_in_exec)