notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 10 Packages Wiki Activity Actions

Merge from booking branch

Browse source
This commit is contained in:
Paul Schneider 2015-11-17 22:22:59 +01:00
commit 9a2652739b
266 changed files with 12833 additions and 2337 deletions
Download patch file Download diff file Expand all files Collapse all files

5
NpgsqlMRPProviders/NpgsqlProfileProvider.cs
View file

@ -206,7 +206,7 @@ namespace Npgsql.Web
cmd.CommandText = "SELECT * from profiledata, profiles where " +
"profiledata.uniqueid = profiles.uniqueid " +
"and profiles.username = @username " +
"and profiles.applicationname = @appname";
"and profiles.applicationname = @appname ";
cmd.Parameters.AddWithValue ("@username", username);
cmd.Parameters.AddWithValue ("@appname", applicationName);
cnx.Open ();
@ -216,7 +216,8 @@ namespace Npgsql.Web
foreach (SettingsProperty p in collection) {
SettingsPropertyValue v = new SettingsPropertyValue (p);
int o = r.GetOrdinal (p.Name.ToLower ());
v.PropertyValue = r.GetValue (o);
var obj = r.GetValue (o);
v.PropertyValue = (obj is DBNull) ? GetDefaultValue (p) : obj;
c.Add (v);
}
} else {