diff options
Diffstat (limited to 'OpenSim/Framework/Data.SQLite')
4 files changed, 35 insertions, 7 deletions
diff --git a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs index 6693c98..5de87c1 100644 --- a/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs | |||
@@ -1,3 +1,31 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSim Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | * | ||
27 | */ | ||
28 | |||
1 | using System.Reflection; | 29 | using System.Reflection; |
2 | using System.Runtime.InteropServices; | 30 | using System.Runtime.InteropServices; |
3 | 31 | ||
@@ -10,7 +38,7 @@ using System.Runtime.InteropServices; | |||
10 | [assembly : AssemblyConfiguration("")] | 38 | [assembly : AssemblyConfiguration("")] |
11 | [assembly : AssemblyCompany("")] | 39 | [assembly : AssemblyCompany("")] |
12 | [assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] | 40 | [assembly : AssemblyProduct("OpenSim.Framework.Data.SQLite")] |
13 | [assembly : AssemblyCopyright("Copyright © 2007")] | 41 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
14 | [assembly : AssemblyTrademark("")] | 42 | [assembly : AssemblyTrademark("")] |
15 | [assembly : AssemblyCulture("")] | 43 | [assembly : AssemblyCulture("")] |
16 | 44 | ||
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs index 9131a41..87d63a5 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteBase.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteBase.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
98 | protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) | 98 | protected static SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) |
99 | { | 99 | { |
100 | string sql = "update " + table + " set "; | 100 | string sql = "update " + table + " set "; |
101 | string subsql = ""; | 101 | string subsql = String.Empty; |
102 | foreach (DataColumn col in dt.Columns) | 102 | foreach (DataColumn col in dt.Columns) |
103 | { | 103 | { |
104 | if (subsql.Length > 0) | 104 | if (subsql.Length > 0) |
@@ -126,7 +126,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
126 | protected static string defineTable(DataTable dt) | 126 | protected static string defineTable(DataTable dt) |
127 | { | 127 | { |
128 | string sql = "create table " + dt.TableName + "("; | 128 | string sql = "create table " + dt.TableName + "("; |
129 | string subsql = ""; | 129 | string subsql = String.Empty; |
130 | foreach (DataColumn col in dt.Columns) | 130 | foreach (DataColumn col in dt.Columns) |
131 | { | 131 | { |
132 | if (subsql.Length > 0) | 132 | if (subsql.Length > 0) |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs index 33b4111..1fd5c47 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteRegionData.cs | |||
@@ -1368,7 +1368,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
1368 | private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) | 1368 | private SqliteCommand createUpdateCommand(string table, string pk, DataTable dt) |
1369 | { | 1369 | { |
1370 | string sql = "update " + table + " set "; | 1370 | string sql = "update " + table + " set "; |
1371 | string subsql = ""; | 1371 | string subsql = String.Empty; |
1372 | foreach (DataColumn col in dt.Columns) | 1372 | foreach (DataColumn col in dt.Columns) |
1373 | { | 1373 | { |
1374 | if (subsql.Length > 0) | 1374 | if (subsql.Length > 0) |
@@ -1396,7 +1396,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
1396 | private string defineTable(DataTable dt) | 1396 | private string defineTable(DataTable dt) |
1397 | { | 1397 | { |
1398 | string sql = "create table " + dt.TableName + "("; | 1398 | string sql = "create table " + dt.TableName + "("; |
1399 | string subsql = ""; | 1399 | string subsql = String.Empty; |
1400 | foreach (DataColumn col in dt.Columns) | 1400 | foreach (DataColumn col in dt.Columns) |
1401 | { | 1401 | { |
1402 | if (subsql.Length > 0) | 1402 | if (subsql.Length > 0) |
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index c4a874f..7647d02 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |||
@@ -630,7 +630,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
630 | { | 630 | { |
631 | if (row[col] == null) | 631 | if (row[col] == null) |
632 | { | 632 | { |
633 | row[col] = ""; | 633 | row[col] = String.Empty; |
634 | } | 634 | } |
635 | } | 635 | } |
636 | } | 636 | } |
@@ -671,7 +671,7 @@ namespace OpenSim.Framework.Data.SQLite | |||
671 | { | 671 | { |
672 | if (row[col] == null) | 672 | if (row[col] == null) |
673 | { | 673 | { |
674 | row[col] = ""; | 674 | row[col] = String.Empty; |
675 | } | 675 | } |
676 | } | 676 | } |
677 | } | 677 | } |