diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/PGSQL/PGSQLMigration.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLMigration.cs')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLMigration.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLMigration.cs b/OpenSim/Data/PGSQL/PGSQLMigration.cs index 709fde0..749a3f2 100644 --- a/OpenSim/Data/PGSQL/PGSQLMigration.cs +++ b/OpenSim/Data/PGSQL/PGSQLMigration.cs | |||
| @@ -54,8 +54,8 @@ namespace OpenSim.Data.PGSQL | |||
| 54 | { | 54 | { |
| 55 | try | 55 | try |
| 56 | { | 56 | { |
| 57 | cmd.CommandText = "select version from migrations where name = '" + type + "' " + | 57 | cmd.CommandText = "select version from migrations where name = '" + type + "' " + |
| 58 | " order by version desc limit 1"; //Must be | 58 | " order by version desc limit 1"; //Must be |
| 59 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) | 59 | using (NpgsqlDataReader reader = cmd.ExecuteReader()) |
| 60 | { | 60 | { |
| 61 | if (reader.Read()) | 61 | if (reader.Read()) |