Skip to content

Commit 4dc9269

Browse files
tomFlidrtomFlidr
committed
active record entity class refactoring
1 parent 39407cc commit 4dc9269

30 files changed

+1641
-1345
lines changed

‎ActiveRecord/Entity/Columns.vb‎

Lines changed: 69 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -8,75 +8,73 @@ Namespace ActiveRecord
88

99

1010

11-
Public Shared Function Columns(Of TActiveRecord)(tableIndex As Int32, Optional separator As String = ",") As String
12-
Return String.Join(
13-
separator, Databasic.ProviderResource.ColumnsArray(GetType(TActiveRecord), tableIndex)
14-
)
15-
End Function
16-
Public Shared Function Columns(Of TActiveRecord)(Optional separator As String = ",", Optional tableIndex As Int32 = 0) As String
17-
Return String.Join(
18-
separator, Databasic.ProviderResource.ColumnsArray(GetType(TActiveRecord), tableIndex)
19-
)
20-
End Function
21-
Public Shared Function Columns(tableIndex As Int32, Optional separator As String = ",") As String
22-
Return String.Join(
23-
separator, Databasic.ProviderResource.ColumnsArray(Tools.GetEntryClassType(), tableIndex)
24-
)
25-
End Function
26-
Public Shared Function Columns(Optional separator As String = ",", Optional tableIndex As Int32 = 0) As String
27-
Return String.Join(
28-
separator, Databasic.ProviderResource.ColumnsArray(Tools.GetEntryClassType(), tableIndex)
29-
)
30-
End Function
31-
32-
33-
34-
35-
36-
Public Shared Function ColumnsExcept(Of TResource)(exceptColumns As String(), Optional tableIndex As Int16 = 0, Optional separator As String = ",") As String
37-
Dim result As List(Of String) = Databasic.ProviderResource.ColumnsList(GetType(TResource), tableIndex)
38-
For Each exceptCol As String In exceptColumns
39-
If result.Contains(exceptCol) Then result.Remove(exceptCol)
40-
Next
41-
Return String.Join(
42-
separator,
43-
Enumerable.ToArray(Of String)(result)
44-
)
45-
End Function
46-
Public Shared Function ColumnsExcept(Of TResource)(exceptColumns As String(), separator As String, Optional tableIndex As Int16 = 0) As String
47-
Dim result As List(Of String) = Databasic.ProviderResource.ColumnsList(GetType(TResource), tableIndex)
48-
For Each exceptCol As String In exceptColumns
49-
If result.Contains(exceptCol) Then result.Remove(exceptCol)
50-
Next
51-
Return String.Join(
52-
separator,
53-
Enumerable.ToArray(Of String)(result)
54-
)
55-
End Function
56-
Public Shared Function ColumnsExcept(exceptColumns As String(), Optional tableIndex As Int16 = 0, Optional separator As String = ",") As String
57-
Dim result As List(Of String) = Databasic.ProviderResource.ColumnsList(Tools.GetEntryClassType(), tableIndex)
58-
For Each exceptCol As String In exceptColumns
59-
If result.Contains(exceptCol) Then result.Remove(exceptCol)
60-
Next
61-
Return String.Join(
62-
separator,
63-
Enumerable.ToArray(Of String)(result)
64-
)
65-
End Function
66-
Public Shared Function ColumnsExcept(exceptColumns As String(), separator As String, Optional tableIndex As Int16 = 0) As String
67-
Dim result As List(Of String) = Databasic.ProviderResource.ColumnsList(Tools.GetEntryClassType(), tableIndex)
68-
For Each exceptCol As String In exceptColumns
69-
If result.Contains(exceptCol) Then result.Remove(exceptCol)
70-
Next
71-
Return String.Join(
72-
separator,
73-
Enumerable.ToArray(Of String)(result)
74-
)
75-
End Function
76-
77-
78-
79-
80-
81-
End Class
11+
Public Shared Function Columns(tableIndex As Integer, Optional separator As String = ",") As String
12+
Return String.Join(separator, ProviderResource.ColumnsArray(
13+
Tools.GetEntryClassType(), tableIndex
14+
))
15+
End Function
16+
17+
Public Shared Function Columns(Of TActiveRecord)(tableIndex As Integer, Optional separator As String = ",") As String
18+
Return String.Join(
19+
separator, ProviderResource.ColumnsArray(GetType(TActiveRecord), tableIndex
20+
))
21+
End Function
22+
23+
Public Shared Function Columns(Optional separator As String = ",", Optional tableIndex As Integer = 0) As String
24+
Return String.Join(separator, ProviderResource.ColumnsArray(
25+
Tools.GetEntryClassType(), tableIndex
26+
))
27+
End Function
28+
29+
Public Shared Function Columns(Of TActiveRecord)(Optional separator As String = ",", Optional tableIndex As Integer = 0) As String
30+
Return String.Join(
31+
separator, ProviderResource.ColumnsArray(GetType(TActiveRecord), tableIndex
32+
))
33+
End Function
34+
35+
Public Shared Function ColumnsExcept(exceptColumns As String(), Optional tableIndex As Short = 0, Optional separator As String = ",") As String
36+
Dim source As List(Of String) = ProviderResource.ColumnsList(
37+
Tools.GetEntryClassType(), tableIndex
38+
)
39+
For Each exceptColumn As String In exceptColumns
40+
If source.Contains(exceptColumn) Then source.Remove(exceptColumn)
41+
Next
42+
Return String.Join(separator, Enumerable.ToArray(Of String)(source))
43+
End Function
44+
45+
Public Shared Function ColumnsExcept(Of TResource)(exceptColumns As String(), Optional tableIndex As Short = 0, Optional separator As String = ",") As String
46+
Dim source As List(Of String) = ProviderResource.ColumnsList(
47+
GetType(TResource), tableIndex
48+
)
49+
For Each exceptColumn As String In exceptColumns
50+
If source.Contains(exceptColumn) Then source.Remove(exceptColumn)
51+
Next
52+
Return String.Join(separator, Enumerable.ToArray(Of String)(source))
53+
End Function
54+
55+
Public Shared Function ColumnsExcept(exceptColumns As String(), separator As String, Optional tableIndex As Short = 0) As String
56+
Dim source As List(Of String) = ProviderResource.ColumnsList(
57+
Tools.GetEntryClassType(), tableIndex
58+
)
59+
For Each exceptColumn As String In exceptColumns
60+
If source.Contains(exceptColumn) Then source.Remove(exceptColumn)
61+
Next
62+
Return String.Join(separator, Enumerable.ToArray(Of String)(source))
63+
End Function
64+
65+
Public Shared Function ColumnsExcept(Of TResource)(exceptColumns As String(), separator As String, Optional tableIndex As Short = 0) As String
66+
Dim source As List(Of String) = ProviderResource.ColumnsList(
67+
GetType(TResource), tableIndex
68+
)
69+
For Each exceptColumn As String In exceptColumns
70+
If source.Contains(exceptColumn) Then source.Remove(exceptColumn)
71+
Next
72+
Return String.Join(separator, Enumerable.ToArray(Of String)(source))
73+
End Function
74+
75+
76+
77+
78+
79+
End Class
8280
End Namespace

0 commit comments

Comments
 (0)