aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorSean Dague2008-11-06 17:07:08 +0000
committerSean Dague2008-11-06 17:07:08 +0000
commit46492f3c1182d68139f914bfe89c81ca8dae1733 (patch)
treefde57370dd37966aa0c034faaeb24570fb71cd14 /OpenSim/Data/MySQL
parentDisable distance sorting for child agents. It makes no sense there, as the (diff)
downloadopensim-SC_OLD-46492f3c1182d68139f914bfe89c81ca8dae1733.zip
opensim-SC_OLD-46492f3c1182d68139f914bfe89c81ca8dae1733.tar.gz
opensim-SC_OLD-46492f3c1182d68139f914bfe89c81ca8dae1733.tar.bz2
opensim-SC_OLD-46492f3c1182d68139f914bfe89c81ca8dae1733.tar.xz
From: arthursv@linux.vnet.ibm.com
Add more unit tests for user cases Persist more user fields into mysql that already had columns defined but weren't getting passed to the mysql manager.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLManager.cs38
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs4
2 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Data/MySQL/MySQLManager.cs b/OpenSim/Data/MySQL/MySQLManager.cs
index c584eb9..a54c020 100644
--- a/OpenSim/Data/MySQL/MySQLManager.cs
+++ b/OpenSim/Data/MySQL/MySQLManager.cs
@@ -561,7 +561,7 @@ namespace OpenSim.Data.MySQL
561 561
562 retval.Created = Convert.ToInt32(reader["created"].ToString()); 562 retval.Created = Convert.ToInt32(reader["created"].ToString());
563 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString()); 563 retval.LastLogin = Convert.ToInt32(reader["lastLogin"].ToString());
564 564
565 retval.UserInventoryURI = (string) reader["userInventoryURI"]; 565 retval.UserInventoryURI = (string) reader["userInventoryURI"];
566 retval.UserAssetURI = (string) reader["userAssetURI"]; 566 retval.UserAssetURI = (string) reader["userAssetURI"];
567 567
@@ -751,6 +751,7 @@ namespace OpenSim.Data.MySQL
751 /// <param name="passwordHash">A salted hash of the users password</param> 751 /// <param name="passwordHash">A salted hash of the users password</param>
752 /// <param name="passwordSalt">The salt used for the password hash</param> 752 /// <param name="passwordSalt">The salt used for the password hash</param>
753 /// <param name="homeRegion">A regionHandle of the users home region</param> 753 /// <param name="homeRegion">A regionHandle of the users home region</param>
754 /// <param name="homeRegionID"> The UUID of the user's home region</param>
754 /// <param name="homeLocX">Home region position vector</param> 755 /// <param name="homeLocX">Home region position vector</param>
755 /// <param name="homeLocY">Home region position vector</param> 756 /// <param name="homeLocY">Home region position vector</param>
756 /// <param name="homeLocZ">Home region position vector</param> 757 /// <param name="homeLocZ">Home region position vector</param>
@@ -770,22 +771,22 @@ namespace OpenSim.Data.MySQL
770 /// <param name="webLoginKey">Ignored</param> 771 /// <param name="webLoginKey">Ignored</param>
771 /// <returns>Success?</returns> 772 /// <returns>Success?</returns>
772 public bool insertUserRow(UUID uuid, string username, string lastname, string email, string passwordHash, 773 public bool insertUserRow(UUID uuid, string username, string lastname, string email, string passwordHash,
773 string passwordSalt, UInt64 homeRegion, float homeLocX, float homeLocY, float homeLocZ, 774 string passwordSalt, UInt64 homeRegion, UUID homeRegionID, float homeLocX, float homeLocY, float homeLocZ,
774 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin, 775 float homeLookAtX, float homeLookAtY, float homeLookAtZ, int created, int lastlogin,
775 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask, 776 string inventoryURI, string assetURI, uint canDoMask, uint wantDoMask,
776 string aboutText, string firstText, 777 string aboutText, string firstText,
777 UUID profileImage, UUID firstImage, UUID webLoginKey) 778 UUID profileImage, UUID firstImage, UUID webLoginKey, int userFlags, int godLevel, string customType, UUID partner)
778 { 779 {
779 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString()); 780 m_log.Debug("[MySQLManager]: Fetching profile for " + uuid.ToString());
780 string sql = 781 string sql =
781 "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, "; 782 "INSERT INTO users (`UUID`, `username`, `lastname`, `email`, `passwordHash`, `passwordSalt`, `homeRegion`, `homeRegionID`, ";
782 sql += 783 sql +=
783 "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, "; 784 "`homeLocationX`, `homeLocationY`, `homeLocationZ`, `homeLookAtX`, `homeLookAtY`, `homeLookAtZ`, `created`, ";
784 sql += 785 sql +=
785 "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, "; 786 "`lastLogin`, `userInventoryURI`, `userAssetURI`, `profileCanDoMask`, `profileWantDoMask`, `profileAboutText`, ";
786 sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`, `userFlags`, `godLevel`, `customType`, `partner`) VALUES "; 787 sql += "`profileFirstText`, `profileImage`, `profileFirstImage`, `webLoginKey`, `userFlags`, `godLevel`, `customType`, `partner`) VALUES ";
787 788
788 sql += "(?UUID, ?username, ?lastname, ?email, ?passwordHash, ?passwordSalt, ?homeRegion, "; 789 sql += "(?UUID, ?username, ?lastname, ?email, ?passwordHash, ?passwordSalt, ?homeRegion, ?homeRegionID, ";
789 sql += 790 sql +=
790 "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, "; 791 "?homeLocationX, ?homeLocationY, ?homeLocationZ, ?homeLookAtX, ?homeLookAtY, ?homeLookAtZ, ?created, ";
791 sql += 792 sql +=
@@ -800,6 +801,7 @@ namespace OpenSim.Data.MySQL
800 parameters["?passwordHash"] = passwordHash; 801 parameters["?passwordHash"] = passwordHash;
801 parameters["?passwordSalt"] = passwordSalt; 802 parameters["?passwordSalt"] = passwordSalt;
802 parameters["?homeRegion"] = homeRegion.ToString(); 803 parameters["?homeRegion"] = homeRegion.ToString();
804 parameters["?homeRegionID"] = homeRegionID.ToString();
803 parameters["?homeLocationX"] = homeLocX.ToString(); 805 parameters["?homeLocationX"] = homeLocX.ToString();
804 parameters["?homeLocationY"] = homeLocY.ToString(); 806 parameters["?homeLocationY"] = homeLocY.ToString();
805 parameters["?homeLocationZ"] = homeLocZ.ToString(); 807 parameters["?homeLocationZ"] = homeLocZ.ToString();
@@ -808,23 +810,21 @@ namespace OpenSim.Data.MySQL
808 parameters["?homeLookAtZ"] = homeLookAtZ.ToString(); 810 parameters["?homeLookAtZ"] = homeLookAtZ.ToString();
809 parameters["?created"] = created.ToString(); 811 parameters["?created"] = created.ToString();
810 parameters["?lastLogin"] = lastlogin.ToString(); 812 parameters["?lastLogin"] = lastlogin.ToString();
811 parameters["?userInventoryURI"] = String.Empty; 813 parameters["?userInventoryURI"] = inventoryURI;
812 parameters["?userAssetURI"] = String.Empty; 814 parameters["?userAssetURI"] = assetURI;
813 parameters["?profileCanDoMask"] = "0"; 815 parameters["?profileCanDoMask"] = canDoMask.ToString();
814 parameters["?profileWantDoMask"] = "0"; 816 parameters["?profileWantDoMask"] = wantDoMask.ToString();
815 parameters["?profileAboutText"] = aboutText; 817 parameters["?profileAboutText"] = aboutText;
816 parameters["?profileFirstText"] = firstText; 818 parameters["?profileFirstText"] = firstText;
817 parameters["?profileImage"] = profileImage.ToString(); 819 parameters["?profileImage"] = profileImage.ToString();
818 parameters["?profileFirstImage"] = firstImage.ToString(); 820 parameters["?profileFirstImage"] = firstImage.ToString();
819 parameters["?webLoginKey"] = string.Empty; 821 parameters["?webLoginKey"] = webLoginKey.ToString();
820 parameters["?userFlags"] = "0"; 822 parameters["?userFlags"] = userFlags.ToString();
821 parameters["?godLevel"] = "0"; 823 parameters["?godLevel"] = godLevel.ToString();
822 parameters["?customType"] = ""; 824 parameters["?customType"] = customType == null ? "" : customType;
823 parameters["?partner"] = ""; 825 parameters["?partner"] = partner.ToString();
824
825
826 bool returnval = false; 826 bool returnval = false;
827 827
828 try 828 try
829 { 829 {
830 IDbCommand result = Query(sql, parameters); 830 IDbCommand result = Query(sql, parameters);
@@ -911,8 +911,8 @@ namespace OpenSim.Data.MySQL
911 parameters["?lastLogin"] = lastlogin.ToString(); 911 parameters["?lastLogin"] = lastlogin.ToString();
912 parameters["?userInventoryURI"] = inventoryURI; 912 parameters["?userInventoryURI"] = inventoryURI;
913 parameters["?userAssetURI"] = assetURI; 913 parameters["?userAssetURI"] = assetURI;
914 parameters["?profileCanDoMask"] = "0"; 914 parameters["?profileCanDoMask"] = canDoMask.ToString();
915 parameters["?profileWantDoMask"] = "0"; 915 parameters["?profileWantDoMask"] = wantDoMask.ToString();
916 parameters["?profileAboutText"] = aboutText; 916 parameters["?profileAboutText"] = aboutText;
917 parameters["?profileFirstText"] = firstText; 917 parameters["?profileFirstText"] = firstText;
918 parameters["?profileImage"] = profileImage.ToString(); 918 parameters["?profileImage"] = profileImage.ToString();
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 47670d2..82b5bbc 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -643,13 +643,13 @@ namespace OpenSim.Data.MySQL
643 try 643 try
644 { 644 {
645 dbm.Manager.insertUserRow(user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt, 645 dbm.Manager.insertUserRow(user.ID, user.FirstName, user.SurName, user.Email, user.PasswordHash, user.PasswordSalt,
646 user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, 646 user.HomeRegion, user.HomeRegionID, user.HomeLocation.X, user.HomeLocation.Y,
647 user.HomeLocation.Z, 647 user.HomeLocation.Z,
648 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, 648 user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
649 user.LastLogin, user.UserInventoryURI, user.UserAssetURI, 649 user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
650 user.CanDoMask, user.WantDoMask, 650 user.CanDoMask, user.WantDoMask,
651 user.AboutText, user.FirstLifeAboutText, user.Image, 651 user.AboutText, user.FirstLifeAboutText, user.Image,
652 user.FirstLifeImage, user.WebLoginKey); 652 user.FirstLifeImage, user.WebLoginKey, user.UserFlags, user.GodLevel, user.CustomType, user.Partner);
653 } 653 }
654 catch (Exception e) 654 catch (Exception e)
655 { 655 {