Extract database from connection string

taddison · Dec 19, 2017 · 9ef19a2 · 9ef19a2
1 parent 97a9fe9
commit 9ef19a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,9 @@ Spelunk your MSSQL code
 
 # Usage
 Command line usage requires three arguments:
-- Connection string
+- Connection string (must specify database/initial catalog)
 - SQL script to parse
-- Database name
 
 ```powershell
-c:\source\SQLSpelunker\src\SQLSpelunker.Console>dotnet run "server=localhost;initial catalog=foo;integrated security=sspi" "exec dbo.SomeProc"; "foo"
+c:\source\SQLSpelunker\src\SQLSpelunker.Console>dotnet run "server=localhost;initial catalog=foo;integrated security=sspi" "exec dbo.SomeProc"
 ```
diff --git a/src/SQLSpelunker.Console/Program.cs b/src/SQLSpelunker.Console/Program.cs
@@ -1,5 +1,6 @@
 using SQLSpelunker.Core;
 using System;
+using System.Data.SqlClient;
 
 namespace SQLSpelunker.Console
 {
@@ -9,17 +10,18 @@ static void Main(string[] args)
         {
             var connectionString = "server=localhost;initial catalog=tsqlscheduler;integrated security=sspi";
             var sqlScript = "exec scheduler.UpsertJobsForAllTasks";
-            var currentDatabase = "tsqlscheduler";
 
             if(args.Length > 0)
             {
                 connectionString = args[0];
                 sqlScript = args[1];
-                currentDatabase = args[2];
             }
 
+            var builder = new SqlConnectionStringBuilder(connectionString);
+            var database = builder.InitialCatalog;
+
             var sw = new ScriptWalker(new SQLDatabaseDefinitionService(connectionString));
-            var callChain = sw.GetCalledProcedures(sqlScript, currentDatabase);
+            var callChain = sw.GetCalledProcedures(sqlScript, database);
             System.Console.WriteLine(callChain.GetCallHierarchy());
         }
     }