Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Specified a different location for the Log File.

Browse Source 
Changed code to use log Info
Changed code to append error messages rather than replace text
Added/Changed code to use Log4Net.
Changed logic for Updates to Use IDs rather than Objects for internal Updates
Added a FormatColumn token to handle DTS, Added comments to describe tokens
Added methods ParentRefU and ParentRefU2 to support otther changes
This commit is contained in:
Rich
2010-12-09 22:27:22 +00:00
parent 7c77423283
commit 3e135d8deb
7 changed files with 154 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
PROMS/MyGeneration/csla_21/CSLA_Objects.csgen
View File

@@ -2230,16 +2230,17 @@ namespace <%=_nameSpace%>
//{
// Commentted out the following two lines for Permissions
// if (!column.IsAutoKey)
sValuesU+=FormatColumn("\r\n\t\t\t\t\t{ifLogicL}cm.Parameters.AddWithValue(\"{@}\", {parent}{?dbtype});",column);
if (IsParentCol(column)){
sKeysTypesU+=sepi + _className + " my" + sParent;
sKeysU+=sepi + "my" + sParent;
}
else
{
sKeysTypesU+=sepu + FormatColumn("{?ref}{!type} {!local}",column);
//sValuesU+=FormatColumn("\r\n\t\t\t\t\t{ifLogicL}cm.Parameters.AddWithValue(\"{@}\", {parent}{?dbtype});",column);
sValuesU+=FormatColumn("\r\n\t\t\t\t\t{ifLogicl}cm.Parameters.AddWithValue(\"{@}\", {local});",column);
//if (IsParentCol(column)){
// sKeysTypesU+= sepi + "/*1*/ " + _className + " my" + sParent;
// sKeysU+=sepi + "my" + sParent;
//}
//else
//{
sKeysTypesU+=sepu + FormatColumn("{?ref}{ctype} {local}",column);
sKeysU+=sepu + FormatColumn("{?ref}{member}",column);
}
//}
sepu=", ";
//}
}
@@ -2260,13 +2261,18 @@ namespace <%=_nameSpace%>
sTimestamp=FormatColumn("{member} = ",column);
if (!IsIn(column,fk.ForeignColumns))
{
string sRef = ParentRef(column);
if (sRef==null)sRef=FormatColumn("{?ref}{?dbprefix}{!propmember}{?dbsuff}",column);
sUpdate+=sepu+sRef;
string sRefI = ParentRef(column);
string sRefU = ParentRefU(column);
if (sRefI==null)
{
sRefI = FormatColumn("{?ref}{?dbprefix}{!propmember}{?dbsuff}",column);
sRefU = FormatColumn("{?ref}{?dbprefix}{member}{?dbsuff}",column);
}
sUpdate+=sepu + sRefU;
sepu=", ";
if (!column.IsComputed)// && !column.IsAutoKey
{
sInsert+=sepi+sRef;
sInsert+=sepi+sRefI;
sepi=", ";
}
}
@@ -2274,8 +2280,8 @@ namespace <%=_nameSpace%>
{
//string sRef = FormatColumn("{?dbprefix}{rmember}{?dbsuff}",RelatedColumn(column,fk));
string sRef = sPrimaryLocal;
sInsert+=sepi + sRef;
sUpdate+=sepu + sRef;
sInsert+=sepi + sPrimaryLocal;
sUpdate+=sepu + sPrimaryLocal + "." + FormatColumn("{?ref}{?dbprefix}{prop}{?dbsuff}",column);
sepi=", ";
sepu=", ";
//sepd=", ";
@@ -2310,13 +2316,15 @@ namespace <%=_nameSpace%>
{
if (column.DataTypeName=="timestamp")
sTimestamp=FormatColumn("{member} = ",column);
string sRef = FormatColumn("{?ref}{?dbprefix}{!member}{?dbsuff}",column);
//string sRef = FormatColumn("{?ref}{?dbprefix}{!member}{?dbsuff}",column);
string sRefI = FormatColumn("{?ref}{?dbprefix}{!member}{?dbsuff}",column);
string sRefU = FormatColumn("{?ref}{?dbprefix}{member}{?dbsuff}",column);
if (!column.IsComputed)// && !column.IsAutoKey
{
sInsert+=sepi+sRef;
sInsert+=sepi+sRefI;
sepi=", ";
}
sUpdate+=sepu + sRef;
sUpdate+=sepu + sRefU;
sepi=", ";
sepu=", ";
}
@@ -4076,37 +4084,52 @@ private void vlnDataPortalFetch(string sPrefix,IColumns cols,string sql,bool get
{
sRead+=sepr+FormatColumn(dicRead,column,"\t\t\t\t","");
sepr="\r\n";
string sRef = ParentRef(column);
if (sRef==null)
string sRefI = ParentRef(column);
string sRefU = ParentRefU2(column);
if (sRefI==null)
{
if (column.IsComputed || column.IsAutoKey)
sRef=FormatColumn("ref {?dbprefix}{member}{?dbsuff}",column);
sRefU = sRefI = FormatColumn("ref {?dbprefix}{member}{?dbsuff}",column);
else
//if (column.IsInPrimaryKey) // 20070326
// sRef=FormatColumn("{?dbprefix}{!membercolumn}{?dbsuff}",column);// 20070323
//else
if (FormatColumn("{!type}",column)==ClassName(fk.ForeignTable))
sRef=FormatColumn("{?dbprefix}{!membercolumn}{?dbsuff}",column);// 20070326
{
sRefI = FormatColumn("{?dbprefix}{!membercolumn}{?dbsuff}",column);// 20070326
sRefU = FormatColumn("{?dbprefix}{member}{?dbsuff}",column);// 20070326
}
else
sRef=FormatColumn("{?dbprefix}{!member}{?dbsuff}",column);// 20070326
{
sRefI=FormatColumn("{?dbprefix}{!member}{?dbsuff}",column);// 20070326
sRefU=FormatColumn("{?dbprefix}{member}{?dbsuff}",column);// 20070326
}
}
sUpdate+=sepu + sRef;
sUpdate+=sepu + sRefU;
sepu=", ";
if (!column.IsComputed)// && !column.IsAutoKey
{
sInsert+=sepi+sRef;
sInsert+=sepi+sRefI;
sepi=", ";
}
}
else
{
string sRef;
string sRefI;
string sRefU;
if (IsRelObj(column))
sRef = FormatColumn("{?dbprefix}{!local}{?dbsuff}",column);
{
sRefI = FormatColumn("{?dbprefix}{!local}{?dbsuff}",column);
string sType = FormatColumn("{ctype}",column);
if(sType.Contains("?"))
sRefU = FormatColumn("{?dbprefix}{!local}{?dbsuff} != null ? ({ctype}) {?dbprefix}{!local}{?dbsuff}.{?dbprefix}{prop}{?dbsuff} : ({ctype}) null",column);
else
sRefU = FormatColumn("{?dbprefix}{!localcolumn}{?dbsuff}",column);
}
else
sRef = FormatColumn("{?dbprefix}{rmember}{?dbsuff}",RelatedColumn(column,fk));
sInsert+=sepi + sRef;
sUpdate+=sepu + sRef;
sRefI = sRefU = FormatColumn("{?dbprefix}{rmember}{?dbsuff}",RelatedColumn(column,fk));
sInsert+=sepi + sRefI;
sUpdate+=sepu + sRefU;
sepi=", ";
sepu=", ";
//sepd=", ";