[Jcframework-commits] dotnet CClassMap.vb,1.43,1.44 CMsSqlDatabase.vb,1.19,1.20

[Richard B. <rb...@us...>]

Update of /cvsroot/jcframework/dotnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31898

Modified Files:
	CClassMap.vb CMsSqlDatabase.vb 
Log Message:
Stupid Mistake Fixes for:
Handling overriden fields in mappings
SSPI connections to MSSQL DBs

Index: CMsSqlDatabase.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CMsSqlDatabase.vb,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- CMsSqlDatabase.vb	18 Oct 2004 03:31:51 -0000	1.19
+++ CMsSqlDatabase.vb	10 Nov 2004 01:21:24 -0000	1.20
@@ -64,8 +64,8 @@
 				"Persist Security Info=False;" & _
 				"User Id=" & m_user & ";" & _
 				"Password=" & m_password
-				conn.Connection.Open()
 			End If
+			conn.Connection.Open()
 		Catch ex As SqlClient.SqlException
 			Throw New DatabaseConnectionException(ex.Message, ex)
 		Catch ex As Exception

Index: CClassMap.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CClassMap.vb,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- CClassMap.vb	9 Nov 2004 11:46:04 -0000	1.43
+++ CClassMap.vb	10 Nov 2004 01:21:24 -0000	1.44
@@ -1438,20 +1438,22 @@
 			End If
 			'Attempt to load column via alias first, then table qualified name then column name
 			'find the correct variation of the column name in the row and the retrieve the value
-			val = Nothing
-			Try
-				If rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasName(pAlias)) Then
-					val = rw.Item(AttrMap.ColumnMap.getAliasName(pAlias))
-				ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasQualifiedName(pAlias)) Then
-					val = rw.Item(AttrMap.ColumnMap.getAliasQualifiedName(pAlias))
-				ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.Name) Then
-					val = rw.Item(AttrMap.ColumnMap.Name)
+			If Not skipAttribute Then
+				val = Nothing
+				Try
+					If rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasName(pAlias)) Then
+						val = rw.Item(AttrMap.ColumnMap.getAliasName(pAlias))
+					ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasQualifiedName(pAlias)) Then
+						val = rw.Item(AttrMap.ColumnMap.getAliasQualifiedName(pAlias))
+					ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.Name) Then
+						val = rw.Item(AttrMap.ColumnMap.Name)
+					End If
+				Catch ex As Exception
+				End Try
+				obj.SetAttributeValue(AttrMap.Name, val)
+				If Not IsDBNull(val) And Not val Is Nothing Then
+					obj.Persistent = True
 				End If
-			Catch ex As Exception
-			End Try
-			obj.SetAttributeValue(AttrMap.Name, val)
-			If Not IsDBNull(val) And Not val Is Nothing Then
-				obj.Persistent = True
 			End If
 		Next i
 	End Sub
@@ -1528,21 +1530,23 @@
 				Catch
 				End Try
 			End If
-			tmpObj = Nothing
-			Try
-				If rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasName(pAlias)) Then
-					tmpObj = rw.Item(AttrMap.ColumnMap.getAliasName(pAlias))
-				ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasQualifiedName(pAlias)) Then
-					tmpObj = rw.Item(AttrMap.ColumnMap.getAliasQualifiedName(pAlias))
-				ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.Name) Then
-					tmpObj = rw.Item(AttrMap.ColumnMap.Name)
-				End If
-			Catch ex As Exception
-			End Try
+			If Not skipAttribute Then
+				tmpObj = Nothing
+				Try
+					If rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasName(pAlias)) Then
+						tmpObj = rw.Item(AttrMap.ColumnMap.getAliasName(pAlias))
+					ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.getAliasQualifiedName(pAlias)) Then
+						tmpObj = rw.Item(AttrMap.ColumnMap.getAliasQualifiedName(pAlias))
+					ElseIf rw.Table.Columns.Contains(AttrMap.ColumnMap.Name) Then
+						tmpObj = rw.Item(AttrMap.ColumnMap.Name)
+					End If
+				Catch ex As Exception
+				End Try
 
-			obj.SetAttributeValue(AttrMap.Name, tmpObj)
-			If Not IsDBNull(tmpObj) And Not tmpObj Is Nothing Then
-				obj.Persistent = True
+				obj.SetAttributeValue(AttrMap.Name, tmpObj)
+				If Not IsDBNull(tmpObj) And Not tmpObj Is Nothing Then
+					obj.Persistent = True
+				End If
 			End If
 		Next i
 	End Sub