aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-01-13 21:53:04 +0000
committerJustin Clark-Casey (justincc)2015-01-13 21:53:04 +0000
commit39989eda3bf0c640ef1726dde7de413a63803e7f (patch)
treea769dcff8ed3848eb79cba8780aaac13c760120f
parentRevert "Remove misstaken quotes from column selection in PGSQLUserProfilesDat... (diff)
downloadopensim-SC_OLD-39989eda3bf0c640ef1726dde7de413a63803e7f.zip
opensim-SC_OLD-39989eda3bf0c640ef1726dde7de413a63803e7f.tar.gz
opensim-SC_OLD-39989eda3bf0c640ef1726dde7de413a63803e7f.tar.bz2
opensim-SC_OLD-39989eda3bf0c640ef1726dde7de413a63803e7f.tar.xz
Revert "Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()"
This reverts commit bd9539c2a73901f063202bb244e556e7f6927bae.
-rw-r--r--OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
index 18acef6..734ef46 100644
--- a/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs
@@ -796,7 +796,7 @@ namespace OpenSim.Data.PGSQL
796 public OSDArray GetUserImageAssets(UUID avatarId) 796 public OSDArray GetUserImageAssets(UUID avatarId)
797 { 797 {
798 OSDArray data = new OSDArray(); 798 OSDArray data = new OSDArray();
799 string query = "SELECT snapshotuuid FROM {0} WHERE creatoruuid = :Id"; 799 string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id";
800 800
801 try 801 try
802 { 802 {
@@ -804,7 +804,7 @@ namespace OpenSim.Data.PGSQL
804 { 804 {
805 dbcon.Open(); 805 dbcon.Open();
806 806
807 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "classifieds"), dbcon)) 807 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon))
808 { 808 {
809 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); 809 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
810 810
@@ -823,7 +823,7 @@ namespace OpenSim.Data.PGSQL
823 dbcon.Close(); 823 dbcon.Close();
824 dbcon.Open(); 824 dbcon.Open();
825 825
826 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon)) 826 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
827 { 827 {
828 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); 828 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
829 829
@@ -842,9 +842,9 @@ namespace OpenSim.Data.PGSQL
842 dbcon.Close(); 842 dbcon.Close();
843 dbcon.Open(); 843 dbcon.Open();
844 844
845 query = "SELECT profileImage, profileFirstImage FROM userprofile WHERE useruuid = :Id"; 845 query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id";
846 846
847 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon)) 847 using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
848 { 848 {
849 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); 849 cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
850 850