Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21350/nhibernate/src/NHibernate/Cfg
Modified Files:
Binder.cs
Log Message:
Implemented Copy, enhanced versioning, support named query/sql-query
Index: Binder.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Cfg/Binder.cs,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Binder.cs 29 Mar 2005 05:35:32 -0000 1.45
--- Binder.cs 30 Mar 2005 16:28:22 -0000 1.46
***************
*** 336,342 ****
if ( val.Type==null ) val.Type = ( ("version".Equals(name)) ? NHibernateUtil.Int32 : NHibernateUtil.Timestamp );
Mapping.Property timestampProp = new Mapping.Property(val);
! BindProperty(subnode, timestampProp, mappings);
model.Version = timestampProp;
! model.AddProperty(timestampProp);
break;
--- 336,343 ----
if ( val.Type==null ) val.Type = ( ("version".Equals(name)) ? NHibernateUtil.Int32 : NHibernateUtil.Timestamp );
Mapping.Property timestampProp = new Mapping.Property(val);
! BindProperty( subnode, timestampProp, mappings );
! MakeVersion( subnode, val );
model.Version = timestampProp;
! model.AddProperty( timestampProp );
break;
***************
*** 1118,1121 ****
--- 1119,1132 ----
}
+ private static void MakeVersion( XmlNode node, SimpleValue model )
+ {
+ // VERSION UNSAVED-VALUE
+ XmlAttribute nullValueNode = node.Attributes["unsaved-value"];
+ if (nullValueNode!=null)
+ model.NullValue = nullValueNode.Value;
+ else
+ model.NullValue = "null";
+ }
+
protected static void PropertiesFromXML(XmlNode node, PersistentClass model, Mappings mappings)
{
***************
*** 1402,1408 ****
{
string qname = n.Attributes["name"].Value;
! string query = n.FirstChild.Value;
log.Debug("Named query: " + qname + " -> " + query);
! model.AddQuery(qname, query);
}
--- 1413,1419 ----
{
string qname = n.Attributes["name"].Value;
! string query = n.InnerText;
log.Debug("Named query: " + qname + " -> " + query);
! model.AddQuery( qname, query );
}
***************
*** 1410,1414 ****
{
string qname = n.Attributes["name"].Value;
! NamedSQLQuery namedQuery = new NamedSQLQuery( n.FirstChild.Value );
foreach(XmlNode returns in n.SelectNodes( nsPrefix + ":return", nsmgr ) )
--- 1421,1425 ----
{
string qname = n.Attributes["name"].Value;
! NamedSQLQuery namedQuery = new NamedSQLQuery( n.InnerText );
foreach(XmlNode returns in n.SelectNodes( nsPrefix + ":return", nsmgr ) )
***************
*** 1434,1438 ****
log.Debug("Named sql query: " + qname + " -> " + namedQuery.QueryString );
! model.AddSQLQuery(qname, namedQuery);
}
--- 1445,1449 ----
log.Debug("Named sql query: " + qname + " -> " + namedQuery.QueryString );
! model.AddSQLQuery( qname, namedQuery );
}
|
