diff options
| author | Diva Canto | 2010-05-09 14:02:02 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-05-09 14:02:02 -0700 |
| commit | 9cf6b81256b6c92cb5d5fb7a6db697f7784191e4 (patch) | |
| tree | 69f8cf1c0065af8e187d9ae9e5167d1fb9094fbc /OpenSim | |
| parent | * Fixed spamming the assets table with map tiles. The tile image ID is now st... (diff) | |
| download | opensim-SC-9cf6b81256b6c92cb5d5fb7a6db697f7784191e4.zip opensim-SC-9cf6b81256b6c92cb5d5fb7a6db697f7784191e4.tar.gz opensim-SC-9cf6b81256b6c92cb5d5fb7a6db697f7784191e4.tar.bz2 opensim-SC-9cf6b81256b6c92cb5d5fb7a6db697f7784191e4.tar.xz | |
Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAssetData.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs index 8c83ef1..d2892e9 100644 --- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs +++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | |||
| @@ -989,8 +989,8 @@ namespace OpenSim.Data.MySQL | |||
| 989 | "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + | 989 | "?TerrainLowerLimit, ?UseEstateSun, ?FixedSun, " + |
| 990 | "?SunPosition, ?Covenant, ?Sandbox, " + | 990 | "?SunPosition, ?Covenant, ?Sandbox, " + |
| 991 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 991 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
| 992 | "?LoadedCreationDateTime, ?LoadedCreationID)" + | 992 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
| 993 | "?map_tile_ID, ?TerrainImageID"; | 993 | "?map_tile_ID)"; |
| 994 | 994 | ||
| 995 | FillRegionSettingsCommand(cmd, rs); | 995 | FillRegionSettingsCommand(cmd, rs); |
| 996 | 996 | ||
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 7d6df8d..7081f99 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs | |||
| @@ -44,7 +44,7 @@ namespace OpenSim.Data.SQLite | |||
| 44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 44 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 45 | 45 | ||
| 46 | private const string SelectAssetSQL = "select * from assets where UUID=:UUID"; | 46 | private const string SelectAssetSQL = "select * from assets where UUID=:UUID"; |
| 47 | private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, UUID from assets limit :start, :count"; | 47 | private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, asset_flags, UUID from assets limit :start, :count"; |
| 48 | private const string DeleteAssetSQL = "delete from assets where UUID=:UUID"; | 48 | private const string DeleteAssetSQL = "delete from assets where UUID=:UUID"; |
| 49 | private const string InsertAssetSQL = "insert into assets(UUID, Name, Description, Type, Local, Temporary, asset_flags, Data) values(:UUID, :Name, :Description, :Type, :Local, :Temporary, :Flags, :Data)"; | 49 | private const string InsertAssetSQL = "insert into assets(UUID, Name, Description, Type, Local, Temporary, asset_flags, Data) values(:UUID, :Name, :Description, :Type, :Local, :Temporary, :Flags, :Data)"; |
| 50 | private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, asset_flags=:Flags, Data=:Data where UUID=:UUID"; | 50 | private const string UpdateAssetSQL = "update assets set Name=:Name, Description=:Description, Type=:Type, Local=:Local, Temporary=:Temporary, asset_flags=:Flags, Data=:Data where UUID=:UUID"; |