VRH / VRH.Log4Pro.MaintenanceConsole

Commit 8288c4759dc15ed8b49267097b205f6631a6cf97

Authored by Schwirg László
1 parent 25232c9b

v1.29.1.0

Showing 2 changed files with 10 additions and 13 deletions   Show diff stats
Inline Side-by-side
Vrh.Log4Pro.MaintenanceConsole/Manager - SQLDataBaseManager.cs
  Show/Hide comments   View file @8288c47
... ... @@ -330,7 +330,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
330 330 if (string.IsNullOrWhiteSpace(selectedserverloginkey))
331 331 {
332 332 ColorConsole.WriteLine(prefix: $"Enter the parameters for creating server login: {sqld.DBName}. Format:", bracket: "()", text: "LOGINNAME[,PASSWORD][,GRANTORUSER[,GRANTORUSERPASSWORD]]", f: ConsoleColor.Yellow);
333   - ColorConsole.WriteLine(prefix: " ", text: "LOGINNAME", bracket: "", suffix: $": server login name");
  333 + ColorConsole.WriteLine(prefix: " ", text: "LOGINNAME", bracket: "", suffix: $": server login name;");
334 334 ColorConsole.WriteLine(prefix: " ", text: "PASSWORD", bracket: "", suffix: $": password for login; empty=windows login is created, non empty=sql login is created");
335 335 ColorConsole.WriteLine(prefix: " ", text: "GRANTORUSER", bracket: "", suffix: $": name of the user in behalf the login is created (that logs in the sql server); default:current user with windows authentication");
336 336 ColorConsole.WriteLine(prefix: " ", text: "GRANTORUSERPASSWORD", bracket: "", suffix: $": password for GRANTORUSER;default:empy (windows authentication is used with GRANTORUSER)");
... ... @@ -338,7 +338,6 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
338 338 var createuseroptions = ColorConsole.ReadLine($"EX=exit.", ConsoleColor.Yellow, suffix: " --> ");
339 339 if (createuseroptions.ToUpper() == "EX") { return o; }
340 340  
341   -
342 341 SQLDataBase.ServerLogin SRVRLogin = CheckParametersInteractive(sqld.DBName, createuseroptions);
343 342 if (SRVRLogin==null) goto getparametersloop;
344 343 ServerLoginsToExecuteList.Add(SRVRLogin);
... ... @@ -379,8 +378,7 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
379 378 if (string.IsNullOrWhiteSpace(SRVRLogin_loginpsw)) { ColorConsole.WriteLine("ERROR! PASSWORD, if set, may not be empty!", ConsoleColor.Red); return null; }
380 379 }
381 380  
382   - LoginType SRVRLogin_logintype = LoginType.WindowsUser;
383   - if (string.IsNullOrWhiteSpace(SRVRLogin_grantoruserloginname) && string.IsNullOrWhiteSpace(SRVRLogin_grantoruserpsw)) { SRVRLogin_logintype = LoginType.SqlLogin; }
  381 + LoginType SRVRLogin_logintype = string.IsNullOrWhiteSpace(SRVRLogin_loginpsw) ? LoginType.WindowsUser : LoginType.SqlLogin;
384 382  
385 383 bool SRVRLogin_removeaction = false;
386 384 string SRVRLogin_defaultdb = "master";
... ... @@ -409,15 +407,13 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
409 407 string SRVRLogin_defaultdb = optionList[4];
410 408  
411 409 if (string.IsNullOrWhiteSpace(SRVRLogin_loginname)) { ColorConsole.WriteLine("ERROR! LOGIN NAME is mandatory!", ConsoleColor.Red); return null; }
412   - if (string.IsNullOrWhiteSpace(SRVRLogin_loginpsw)) { ColorConsole.WriteLine("ERROR! LOGIN PASSWORD is mandatory!", ConsoleColor.Red); return null; }
413 410 if (!string.IsNullOrWhiteSpace(SRVRLogin_grantoruserloginname) && string.IsNullOrWhiteSpace(SRVRLogin_grantoruserpsw) || string.IsNullOrWhiteSpace(SRVRLogin_grantoruserloginname) && !string.IsNullOrWhiteSpace(SRVRLogin_grantoruserpsw))
414 411 {
415 412 ColorConsole.WriteLine("ERROR! GRANTORUSER/GRANTORUSERPASSWORD, both must be empty or both must be non-empty!", ConsoleColor.Red); return null;
416 413 }
417 414 if (string.IsNullOrWhiteSpace(SRVRLogin_defaultdb)) { SRVRLogin_defaultdb="master"; }
418 415  
419   - LoginType SRVRLogin_logintype = LoginType.WindowsUser;
420   - if (string.IsNullOrWhiteSpace(SRVRLogin_grantoruserloginname) && string.IsNullOrWhiteSpace(SRVRLogin_grantoruserpsw)) { SRVRLogin_logintype = LoginType.SqlLogin; }
  416 + LoginType SRVRLogin_logintype = string.IsNullOrWhiteSpace(SRVRLogin_loginpsw) ? LoginType.WindowsUser : LoginType.SqlLogin;
421 417  
422 418 bool SRVRLogin_removeaction = false;
423 419  
... ... @@ -439,8 +435,9 @@ namespace Vrh.Log4Pro.MaintenanceConsole.SQLDataBaseManagerNS
439 435 try
440 436 {
441 437 string removeactionText = srvrlogintoexecute.Remove ? "REMOVE" : "CREATE";
442   - string passwordtext = srvrlogintoexecute.LoginType == LoginType.WindowsUser ? "" : $", password:{srvrlogintoexecute.LoginPassword}";
443   - string SRVRLogin_fulldesignation = $"db={srvrlogintoexecute.Db},login name={srvrlogintoexecute.LoginName},login type: {srvrlogintoexecute.LoginType}{passwordtext}";
  438 + string passwordtext = srvrlogintoexecute.LoginType == LoginType.WindowsUser ? "" : $" (psw:{srvrlogintoexecute.LoginPassword})";
  439 + string grantorusertext = !string.IsNullOrWhiteSpace(srvrlogintoexecute.GrantorUserLoginName) && !string.IsNullOrWhiteSpace(srvrlogintoexecute.GrantorUserLoginPassword) ? $",grantor user:{srvrlogintoexecute.GrantorUserLoginName} (psw:{srvrlogintoexecute.GrantorUserLoginPassword})" : "";
  440 + string SRVRLogin_fulldesignation = $"db={srvrlogintoexecute.Db},login type: {srvrlogintoexecute.LoginType},login name={srvrlogintoexecute.LoginName}{passwordtext}{grantorusertext}";
444 441 if (!allconfirmed)
445 442 {
446 443 ColorConsole.WriteLine();
... ... @@ -2469,7 +2466,7 @@ GO
2469 2466 public static class LoginName { public static class Values { public const string DEFAULT = ""; } }
2470 2467 public static class LoginPassword { public static class Values { public const string DEFAULT = ""; } }
2471 2468 public static class GrantorLoginName { public static class Values { public const string DEFAULT = ""; } }
2472   - public static class GrantorLoginPsw { public static class Values { public const string DEFAULT = ""; } }
  2469 + public static class GrantorLoginPassword { public static class Values { public const string DEFAULT = ""; } }
2473 2470 public static class DefaultDatabase{ public static class Values { public const string DEFAULT = ""; } }
2474 2471 }
2475 2472 }
... ... @@ -2635,7 +2632,7 @@ GO
2635 2632 LoginName = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.LoginName), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.LoginName.Values.DEFAULT);
2636 2633 LoginPassword = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.LoginPassword), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.LoginPassword.Values.DEFAULT);
2637 2634 GrantorUserLoginName = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginName), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginName.Values.DEFAULT);
2638   - GrantorUserLoginPassword = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginPsw), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginPsw.Values.DEFAULT);
  2635 + GrantorUserLoginPassword = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginPassword), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.GrantorLoginPassword.Values.DEFAULT);
2639 2636 DefaultDatabase = GetValue(nameof(XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.DefaultDatabase), dbusrXml, XmlStructure.SQLDataBase.ServerLogins.ServerLogin.Attributes.DefaultDatabase.Values.DEFAULT);
2640 2637 }
2641 2638 #endregion constructors
... ...
Vrh.Log4Pro.MaintenanceConsole/Properties/AssemblyInfo.cs
  Show/Hide comments   View file @8288c47
... ... @@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
32 32 // You can specify all the values or you can default the Build and Revision Numbers
33 33 // by using the '*' as shown below:
34 34 // [assembly: AssemblyVersion("1.0.*")]
35   -[assembly: AssemblyVersion("1.29.0.0")]
36   -[assembly: AssemblyFileVersion("1.29.0.0")]
  35 +[assembly: AssemblyVersion("1.29.1.0")]
  36 +[assembly: AssemblyFileVersion("1.29.1.0")]
... ...