diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs')
-rw-r--r-- | OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs index 061de22..5b24720 100644 --- a/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs +++ b/OpenSim/Data/PGSQL/PGSQLGenericTableHandler.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Data.PGSQL | |||
64 | : base(connectionString) | 64 | : base(connectionString) |
65 | { | 65 | { |
66 | m_Realm = realm; | 66 | m_Realm = realm; |
67 | 67 | ||
68 | m_ConnectionString = connectionString; | 68 | m_ConnectionString = connectionString; |
69 | 69 | ||
70 | if (storeName != String.Empty) | 70 | if (storeName != String.Empty) |
@@ -104,7 +104,7 @@ namespace OpenSim.Data.PGSQL | |||
104 | m_FieldTypes = new Dictionary<string, string>(); | 104 | m_FieldTypes = new Dictionary<string, string>(); |
105 | 105 | ||
106 | string query = string.Format(@"select column_name,data_type | 106 | string query = string.Format(@"select column_name,data_type |
107 | from INFORMATION_SCHEMA.COLUMNS | 107 | from INFORMATION_SCHEMA.COLUMNS |
108 | where table_name = lower('{0}'); | 108 | where table_name = lower('{0}'); |
109 | 109 | ||
110 | ", m_Realm); | 110 | ", m_Realm); |
@@ -232,7 +232,7 @@ namespace OpenSim.Data.PGSQL | |||
232 | if (reader == null) | 232 | if (reader == null) |
233 | return new T[0]; | 233 | return new T[0]; |
234 | 234 | ||
235 | CheckColumnNames(reader); | 235 | CheckColumnNames(reader); |
236 | 236 | ||
237 | while (reader.Read()) | 237 | while (reader.Read()) |
238 | { | 238 | { |
@@ -339,7 +339,7 @@ namespace OpenSim.Data.PGSQL | |||
339 | names.Add(fi.Name); | 339 | names.Add(fi.Name); |
340 | values.Add(":" + fi.Name); | 340 | values.Add(":" + fi.Name); |
341 | // Temporarily return more information about what field is unexpectedly null for | 341 | // Temporarily return more information about what field is unexpectedly null for |
342 | // http://opensimulator.org/mantis/view.php?id=5403. This might be due to a bug in the | 342 | // http://opensimulator.org/mantis/view.php?id=5403. This might be due to a bug in the |
343 | // InventoryTransferModule or we may be required to substitute a DBNull here. | 343 | // InventoryTransferModule or we may be required to substitute a DBNull here. |
344 | if (fi.GetValue(row) == null) | 344 | if (fi.GetValue(row) == null) |
345 | throw new NullReferenceException( | 345 | throw new NullReferenceException( |
@@ -395,11 +395,11 @@ namespace OpenSim.Data.PGSQL | |||
395 | } | 395 | } |
396 | string where = String.Join(" AND ", terms.ToArray()); | 396 | string where = String.Join(" AND ", terms.ToArray()); |
397 | query.AppendFormat(" WHERE {0} ", where); | 397 | query.AppendFormat(" WHERE {0} ", where); |
398 | 398 | ||
399 | } | 399 | } |
400 | cmd.Connection = conn; | 400 | cmd.Connection = conn; |
401 | cmd.CommandText = query.ToString(); | 401 | cmd.CommandText = query.ToString(); |
402 | 402 | ||
403 | conn.Open(); | 403 | conn.Open(); |
404 | if (cmd.ExecuteNonQuery() > 0) | 404 | if (cmd.ExecuteNonQuery() > 0) |
405 | { | 405 | { |
@@ -416,7 +416,7 @@ namespace OpenSim.Data.PGSQL | |||
416 | query.Append("\") values (" + String.Join(",", values.ToArray()) + ")"); | 416 | query.Append("\") values (" + String.Join(",", values.ToArray()) + ")"); |
417 | cmd.Connection = conn; | 417 | cmd.Connection = conn; |
418 | cmd.CommandText = query.ToString(); | 418 | cmd.CommandText = query.ToString(); |
419 | 419 | ||
420 | // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText); | 420 | // m_log.WarnFormat("[PGSQLGenericTable]: Inserting into {0} sql {1}", m_Realm, cmd.CommandText); |
421 | 421 | ||
422 | if (conn.State != ConnectionState.Open) | 422 | if (conn.State != ConnectionState.Open) |