Refactoring: replace ToLower -> ToLowerInvariant
authorKonstantin Triger <kostat@mono-cvs.ximian.com>
Thu, 3 May 2007 10:37:39 +0000 (10:37 -0000)
committerKonstantin Triger <kostat@mono-cvs.ximian.com>
Thu, 3 May 2007 10:37:39 +0000 (10:37 -0000)
svn path=/trunk/mcs/; revision=76603

mcs/class/Mainsoft.Web/Mainsoft.Web.Profile/DerbyProfileHelper.cs
mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyApplicationsHelper.cs
mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyMembershipHelper.cs
mcs/class/Mainsoft.Web/Mainsoft.Web.Security/DerbyRolesHelper.cs

index a838710762ac9dfb5f32a83cd89ef8aab0e26953..ededd515ddc4629ada3ac4f45e74bf777f405c95 100644 (file)
@@ -131,7 +131,7 @@ namespace Mainsoft.Web.Profile
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
                        AddParameter (cmdSelect, "LastActivityDate", inactiveSinceDate);\r
                        if (!string.IsNullOrEmpty (userNameToMatch))\r
-                               AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLower());\r
+                               AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLowerInvariant());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -151,7 +151,7 @@ namespace Mainsoft.Web.Profile
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
                        if (!string.IsNullOrEmpty (userNameToMatch))\r
-                               AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLower ());\r
+                               AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -263,7 +263,7 @@ namespace Mainsoft.Web.Profile
                        if (trans != null)\r
                                selectCmd.Transaction = (OleDbTransaction) trans;\r
 \r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
index 3c3e89db1350b202f7f82e97dc0b297e7d8388ff..0c43a572d565a0e29dfe237ab85e69fe6ada4fc4 100644 (file)
@@ -53,7 +53,7 @@ namespace Mainsoft.Web.Security
                        string insertQuery = "INSERT INTO aspnet_Applications (ApplicationId, ApplicationName, LoweredApplicationName) VALUES  (?, ?, ?)";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -64,7 +64,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand insertCmd = new OleDbCommand (insertQuery, (OleDbConnection) connection);\r
                        AddParameter (insertCmd, "ApplicationId", applicationId);\r
                        AddParameter (insertCmd, "ApplicationName", applicationName);\r
-                       AddParameter (insertCmd, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (insertCmd, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        insertCmd.ExecuteNonQuery ();\r
 \r
                        return applicationId;\r
@@ -75,7 +75,7 @@ namespace Mainsoft.Web.Security
                        string selectQuery = "SELECT ApplicationId FROM aspnet_Applications WHERE LoweredApplicationName = ?";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
                                        return reader.GetString (0);\r
index 40c05d74f91d23b26f1ddfbe00231567ef34e33e..219a0b4120f7e334fb4762bdb8f1e3c7b5f74578 100644 (file)
@@ -106,7 +106,7 @@ namespace Mainsoft.Web.Security
                                        OleDbCommand cmdMbrEmail = new OleDbCommand (queryMbrEmail, (OleDbConnection) connection);\r
                                        cmdMbrEmail.Transaction = trans;\r
                                        AddParameter (cmdMbrEmail, "ApplicationId", applicationId);\r
-                                       AddParameter (cmdMbrEmail, "LoweredEmail", email.ToLower ());\r
+                                       AddParameter (cmdMbrEmail, "LoweredEmail", email.ToLowerInvariant ());\r
                                        using (OleDbDataReader reader = cmdMbrEmail.ExecuteReader ()) {\r
                                                if (reader.Read ()) {\r
                                                        trans.Rollback ();\r
@@ -139,7 +139,7 @@ namespace Mainsoft.Web.Security
                                AddParameter (cmdInsertMbr, "PasswordFormat", passwordFormat);\r
                                AddParameter (cmdInsertMbr, "PasswordSalt", passwordSalt);\r
                                AddParameter (cmdInsertMbr, "Email", email);\r
-                               AddParameter (cmdInsertMbr, "LoweredEmail", email != null ? email.ToLower () : null);\r
+                               AddParameter (cmdInsertMbr, "LoweredEmail", email != null ? email.ToLowerInvariant () : null);\r
                                AddParameter (cmdInsertMbr, "PasswordQuestion", pwdQuestion);\r
                                AddParameter (cmdInsertMbr, "PasswordAnswer", pwdAnswer);\r
                                AddParameter (cmdInsertMbr, "IsApproved", isApproved);\r
@@ -171,7 +171,7 @@ namespace Mainsoft.Web.Security
                                "FROM aspnet_Membership mbr, aspnet_Users usr " +\r
                                "WHERE usr.UserId = mbr.UserId AND mbr.LoweredEmail LIKE ? ORDER BY usr.LoweredUserName";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredEmail", emailToMatch.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredEmail", emailToMatch.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -183,7 +183,7 @@ namespace Mainsoft.Web.Security
                                "FROM aspnet_Membership mbr, aspnet_Users usr " +\r
                                "WHERE usr.UserId = mbr.UserId AND usr.LoweredUserName LIKE ? ORDER BY usr.LoweredUserName";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", userNameToMatch.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -208,7 +208,7 @@ namespace Mainsoft.Web.Security
 \r
                        OleDbCommand cmdUsersActive = new OleDbCommand (queryUsersActive, (OleDbConnection) connection);\r
                        AddParameter (cmdUsersActive, "LastActivityDate", currentTimeUtc.AddMinutes (-minutesSinceLastInActive));\r
-                       AddParameter (cmdUsersActive, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (cmdUsersActive, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        using (OleDbDataReader reader = cmdUsersActive.ExecuteReader ()) {\r
                                if (reader.Read ())\r
                                        return reader.GetInt32 (0);\r
@@ -224,8 +224,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        password = null;\r
                        string dbUserId = null;\r
@@ -298,8 +298,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
                        reader = cmdSelect.ExecuteReader ();\r
                        return 0;\r
                }\r
@@ -311,9 +311,9 @@ namespace Mainsoft.Web.Security
                                "usr.UserId = mbr.UserId AND mbr.LoweredEmail " + (email == null ? "IS NULL" : "= ?");\r
 \r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
                        if (email != null)\r
-                               AddParameter (cmdSelect, "LoweredEmail", email.ToLower ());\r
+                               AddParameter (cmdSelect, "LoweredEmail", email.ToLowerInvariant ());\r
 \r
                        username = null;\r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
@@ -379,8 +379,8 @@ namespace Mainsoft.Web.Security
                                "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        string dbUserId = null;\r
                        string dbPassword = null;\r
@@ -503,7 +503,7 @@ namespace Mainsoft.Web.Security
                                "IsApproved = ?, LastLoginDate = ? WHERE UserId = ?";\r
                        OleDbCommand cmdUpdateMember = new OleDbCommand (queryUpdateMember, (OleDbConnection) connection);\r
                        AddParameter (cmdUpdateMember, "Email", email);\r
-                       AddParameter (cmdUpdateMember, "LoweredEmail", email.ToLower ());\r
+                       AddParameter (cmdUpdateMember, "LoweredEmail", email.ToLowerInvariant ());\r
                        AddParameter (cmdUpdateMember, "Comment", comment);\r
                        AddParameter (cmdUpdateMember, "IsApproved", isApproved);\r
                        AddParameter (cmdUpdateMember, "LastLoginDate", lastLoginDate);\r
@@ -521,8 +521,8 @@ namespace Mainsoft.Web.Security
                                                        "WHERE app.LoweredApplicationName = ? AND usr.ApplicationId = app.ApplicationId " +\r
                                                        "AND usr.UserId = mbr.UserId AND usr.LoweredUserName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
-                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLower ());\r
-                       AddParameter (cmdSelect, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredApplicationName", applicationName.ToLowerInvariant ());\r
+                       AddParameter (cmdSelect, "LoweredUserName", username.ToLowerInvariant ());\r
 \r
                        string dbUserId = string.Empty;\r
                        bool dbIsApproved = false;\r
@@ -599,7 +599,7 @@ namespace Mainsoft.Web.Security
                {\r
                        string selectQuery = "SELECT UserId FROM aspnet_Users WHERE LoweredUserName = ? AND ApplicationId = ?";\r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        if (trans != null)\r
                                selectCmd.Transaction = (OleDbTransaction) trans;\r
@@ -636,7 +636,7 @@ namespace Mainsoft.Web.Security
                        AddParameter (insertCmd, "ApplicationId", applicationId);\r
                        AddParameter (insertCmd, "UserId", userId);\r
                        AddParameter (insertCmd, "UserName", username);\r
-                       AddParameter (insertCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (insertCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (insertCmd, "IsAnonymous", isAnonymous);\r
                        AddParameter (insertCmd, "LastActivityDate", lastActivityDate);\r
                        if (trans != null)\r
@@ -725,8 +725,8 @@ namespace Mainsoft.Web.Security
                                "AND usr.UserId = mbr.UserId";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
-                       AddParameter (selectCmd, "PasswordAnswer", applicationName.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
+                       AddParameter (selectCmd, "PasswordAnswer", applicationName.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
index fdfce9bbc6ba53d5b147f6a144a8581d9525b061..125b31e37c61e34258b3b4287b2ed7fe5eaead06 100644 (file)
@@ -57,7 +57,7 @@ namespace Mainsoft.Web.Security
                        string querySelect = "SELECT RoleName FROM aspnet_Roles WHERE ApplicationId = ? AND LoweredRoleName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
-                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -69,7 +69,7 @@ namespace Mainsoft.Web.Security
                        AddParameter (cmdInsert, "ApplicationId", appId);\r
                        AddParameter (cmdInsert, "RoleId", Guid.NewGuid ().ToString ());\r
                        AddParameter (cmdInsert, "RoleName", rolename);\r
-                       AddParameter (cmdInsert, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdInsert, "LoweredRoleName", rolename.ToLowerInvariant ());\r
                        cmdInsert.ExecuteNonQuery ();\r
 \r
                        return 0;\r
@@ -134,7 +134,7 @@ namespace Mainsoft.Web.Security
                        string querySelect = "SELECT RoleName FROM aspnet_Roles WHERE ApplicationId = ? AND LoweredRoleName = ?";\r
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
-                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (cmdSelect, "LoweredRoleName", rolename.ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelect.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -157,7 +157,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelUsers = new OleDbCommand (querySelUsers, (OleDbConnection) connection);\r
                        AddParameter (cmdSelUsers, "ApplicationId", appId);\r
                        for (int i = 0; i < userNames.Length; i++)\r
-                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLower ());\r
+                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLowerInvariant ());\r
 \r
                        int userIndex = 0;\r
                        using (OleDbDataReader reader = cmdSelUsers.ExecuteReader ()) {\r
@@ -171,7 +171,7 @@ namespace Mainsoft.Web.Security
                        if (userNames.Length != userIndex) {\r
                                // find not existing users and create them\r
                                for (int j = 0; j < userNames.Length; j++)\r
-                                       if (Array.IndexOf (loweredUsernames, userNames [j].ToLower ()) < 0) {\r
+                                       if (Array.IndexOf (loweredUsernames, userNames [j].ToLowerInvariant ()) < 0) {\r
                                                string newUserId = Guid.NewGuid ().ToString ();\r
                                                string queryAddUser = "INSERT INTO aspnet_Users (ApplicationId, UserId, UserName, " +\r
                                                        "LoweredUserName, IsAnonymous, LastActivityDate) VALUES (?, ?, ?, ?, ?, ?)";\r
@@ -179,7 +179,7 @@ namespace Mainsoft.Web.Security
                                                AddParameter (cmdAddUser, "ApplicationId", appId);\r
                                                AddParameter (cmdAddUser, "UserId", newUserId);\r
                                                AddParameter (cmdAddUser, "UserName", userNames [j]);\r
-                                               AddParameter (cmdAddUser, "LoweredUserName", userNames [j].ToLower ());\r
+                                               AddParameter (cmdAddUser, "LoweredUserName", userNames [j].ToLowerInvariant ());\r
                                                AddParameter (cmdAddUser, "IsAnonymous", 0);\r
                                                AddParameter (cmdAddUser, "LastActivityDate", DateTime.UtcNow);\r
                                                cmdAddUser.ExecuteNonQuery ();\r
@@ -193,7 +193,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelRoles = new OleDbCommand (querySelRoles, (OleDbConnection) connection);\r
                        AddParameter (cmdSelRoles, "ApplicationId", appId);\r
                        for (int i = 0; i < roleNames.Length; i++)\r
-                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLower ());\r
+                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelRoles.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -250,7 +250,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelect = new OleDbCommand (querySelect, (OleDbConnection) connection);\r
                        AddParameter (cmdSelect, "ApplicationId", appId);\r
                        AddParameter (cmdSelect, "RoleId", roleId);\r
-                       AddParameter (cmdSelect, "LoweredUserName", "%" + userNameToMatch.ToLower() + "%");\r
+                       AddParameter (cmdSelect, "LoweredUserName", "%" + userNameToMatch.ToLowerInvariant() + "%");\r
                        reader = cmdSelect.ExecuteReader ();\r
 \r
                        return 0;\r
@@ -336,7 +336,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelUsers = new OleDbCommand (querySelUsers, (OleDbConnection) connection);\r
                        AddParameter (cmdSelUsers, "ApplicationId", appId);\r
                        for (int i = 0; i < userNames.Length; i++)\r
-                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLower ());\r
+                               AddParameter (cmdSelUsers, "LoweredUserName", userNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelUsers.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -351,7 +351,7 @@ namespace Mainsoft.Web.Security
                        OleDbCommand cmdSelRoles = new OleDbCommand (querySelRoles, (OleDbConnection) connection);\r
                        AddParameter (cmdSelRoles, "ApplicationId", appId);\r
                        for (int i = 0; i < roleNames.Length; i++)\r
-                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLower ());\r
+                               AddParameter (cmdSelRoles, "LoweredRoleName", roleNames [i].ToLowerInvariant ());\r
 \r
                        using (OleDbDataReader reader = cmdSelRoles.ExecuteReader ()) {\r
                                int i = 0;\r
@@ -390,7 +390,7 @@ namespace Mainsoft.Web.Security
                        string selectQuery = "SELECT RoleId FROM aspnet_Roles WHERE LoweredRoleName = ? AND ApplicationId = ?";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredRoleName", rolename.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredRoleName", rolename.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r
@@ -405,7 +405,7 @@ namespace Mainsoft.Web.Security
                        string selectQuery = "SELECT UserId FROM aspnet_Users WHERE LoweredUserName = ? AND ApplicationId = ?";\r
 \r
                        OleDbCommand selectCmd = new OleDbCommand (selectQuery, (OleDbConnection) connection);\r
-                       AddParameter (selectCmd, "LoweredUserName", username.ToLower ());\r
+                       AddParameter (selectCmd, "LoweredUserName", username.ToLowerInvariant ());\r
                        AddParameter (selectCmd, "ApplicationId", applicationId);\r
                        using (OleDbDataReader reader = selectCmd.ExecuteReader ()) {\r
                                if (reader.Read ())\r