Update of /cvsroot/jcframework/dotnet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4502
Modified Files:
CInjectedObject.vb CPersistentObject.vb userguide.sh5
Log Message:
Changes to properly support MSSQL Guid columns
Index: CInjectedObject.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CInjectedObject.vb,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- CInjectedObject.vb 11 Apr 2005 23:27:06 -0000 1.27
+++ CInjectedObject.vb 21 Apr 2005 23:00:28 -0000 1.28
@@ -449,6 +449,8 @@
If dotPos = -1 Then
If TypeOf (value) Is System.SByte Then
CallByName(obj, name, CallType.Set, IIf(value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(obj, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
CallByName(obj, name, CallType.Set, value)
End If
@@ -467,6 +469,8 @@
val = o
If TypeOf (value) Is System.SByte Then
CallByName(val, propertyName, CallType.Set, IIf(value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(val, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
CallByName(val, propertyName, CallType.Set, value)
End If
@@ -474,6 +478,8 @@
Else
If TypeOf (value) Is System.SByte Then
CallByName(o, propertyName, CallType.Set, IIf(value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(o, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
CallByName(o, propertyName, CallType.Set, value)
End If
Index: CPersistentObject.vb
===================================================================
RCS file: /cvsroot/jcframework/dotnet/CPersistentObject.vb,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- CPersistentObject.vb 11 Apr 2005 23:27:07 -0000 1.67
+++ CPersistentObject.vb 21 Apr 2005 23:00:29 -0000 1.68
@@ -515,9 +515,11 @@
Try
If dotPos = -1 Then
If TypeOf (Value) Is System.SByte Then
- CallByName(Me, name, CallType.Set, IIf(Value.ToString = "1", True, False))
+ CallByName(Me, name, CallType.Set, IIf(value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(Me, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
- CallByName(Me, name, CallType.Set, Value)
+ CallByName(Me, name, CallType.Set, value)
End If
Else
Dim o As Object
@@ -531,15 +533,19 @@
val = o
If TypeOf (Value) Is System.SByte Then
CallByName(val, propertyName, CallType.Set, IIf(Value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(val, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
- CallByName(val, propertyName, CallType.Set, Value)
+ CallByName(val, propertyName, CallType.Set, value)
End If
CallByName(Me, objName, CallType.Set, val)
Else
If TypeOf (Value) Is System.SByte Then
CallByName(o, propertyName, CallType.Set, IIf(Value.ToString = "1", True, False))
+ ElseIf TypeOf (value) Is System.Guid Then
+ CallByName(o, name, CallType.Set, CType(value, Guid).ToString("N"))
Else
- CallByName(o, propertyName, CallType.Set, Value)
+ CallByName(o, propertyName, CallType.Set, value)
End If
End If
End If
Index: userguide.sh5
===================================================================
RCS file: /cvsroot/jcframework/dotnet/userguide.sh5,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
Binary files /tmp/cvsz5Mg5j and /tmp/cvstEf0y7 differ
|
