Menu
▾
▴
[Nhibernate-commit] SF.net SVN: nhibernate:[5539] trunk/nhibernate/src/NHibernate/Cfg/ MappingSchema
|
From: <fab...@us...> - 2011-03-26 15:45:55
|
Revision: 5539
http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5539&view=rev
Author: fabiomaulo
Date: 2011-03-26 15:45:48 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Starting NH-2602
Modified Paths:
--------------
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs
trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmArray.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertyMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBag.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -75,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmBase.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -24,13 +24,7 @@
protected static string JoinString(string[] text)
{
- if (text != null)
- {
- string result = string.Join(System.Environment.NewLine, text).Trim();
- return result.Length == 0 ? null : result;
- }
- else
- return null;
+ return text.JoinString();
}
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmClass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -156,6 +156,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmExtensions.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -72,5 +72,15 @@
throw new ArgumentOutOfRangeException("cacheMode");
}
}
+
+ public static string JoinString(this string[] source)
+ {
+ if (source != null)
+ {
+ string result = string.Join(System.Environment.NewLine, source).Trim();
+ return result.Length == 0 ? null : result;
+ }
+ return null;
+ }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmIdbag.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoin.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -31,6 +31,14 @@
#endregion
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#region Implementation of IPropertiesContainerMapping
[XmlIgnore]
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmJoinedSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -111,6 +112,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmList.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IIndexedCollection
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMap.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmPrimitiveArray.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Xml.Serialization;
@@ -74,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertyMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSet.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -75,6 +75,14 @@
get { return sqldeleteall; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of ICollectionPropertiesMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -127,6 +128,11 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get { return null; }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmUnionSubclass.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -1,3 +1,4 @@
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
@@ -112,6 +113,14 @@
get { return sqldelete; }
}
+ public string Subselect
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(subselect1) ? subselect1 : (subselect != null ? subselect.Text.JoinString() : null);
+ }
+ }
+
#endregion
#region Implementation of IPropertiesContainerMapping
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/ICollectionSqlsMapping.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -7,5 +7,6 @@
HbmCustomSQL SqlUpdate { get; }
HbmCustomSQL SqlDelete { get; }
HbmCustomSQL SqlDeleteAll { get; }
+ string Subselect { get; }
}
}
\ No newline at end of file
Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs 2011-03-26 12:30:28 UTC (rev 5538)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/IEntitySqlsMapping.cs 2011-03-26 15:45:48 UTC (rev 5539)
@@ -6,5 +6,6 @@
HbmCustomSQL SqlInsert { get; }
HbmCustomSQL SqlUpdate { get; }
HbmCustomSQL SqlDelete { get; }
+ string Subselect { get; }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
