Merge from booking branch
This commit is contained in:
parent
25906d0227
commit
9a2652739b
266 changed files with 12833 additions and 2337 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2015-11-11 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* NpgsqlProfileProvider.cs: return the default value in the
|
||||
targeted Type, in case of DBNull
|
||||
|
||||
2015-11-06 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* NpgsqlProfileProvider.cs: nicer code
|
||||
|
||||
2015-11-04 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* NpgsqlProfileProvider.cs:
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue