From 39989eda3bf0c640ef1726dde7de413a63803e7f Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 13 Jan 2015 21:53:04 +0000 Subject: Revert "Remove quotes from column selection in PGSQLUserProfilesData.GetUserImageAssets()" This reverts commit bd9539c2a73901f063202bb244e556e7f6927bae. --- OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'OpenSim/Data') 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 public OSDArray GetUserImageAssets(UUID avatarId) { OSDArray data = new OSDArray(); - string query = "SELECT snapshotuuid FROM {0} WHERE creatoruuid = :Id"; + string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id"; try { @@ -804,7 +804,7 @@ namespace OpenSim.Data.PGSQL { dbcon.Open(); - using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "classifieds"), dbcon)) + using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon)) { cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); @@ -823,7 +823,7 @@ namespace OpenSim.Data.PGSQL dbcon.Close(); dbcon.Open(); - using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon)) + using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon)) { cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); @@ -842,9 +842,9 @@ namespace OpenSim.Data.PGSQL dbcon.Close(); dbcon.Open(); - query = "SELECT profileImage, profileFirstImage FROM userprofile WHERE useruuid = :Id"; + query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id"; - using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon)) + using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon)) { cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId)); -- cgit v1.1