Skip to content

Commit cbf39d3

Browse files
StefHStefH
authored
Add BBAN (StefH#8)
* regex * BBAN * BBAN * .
1 parent 1d5a501 commit cbf39d3

18 files changed

+425
-58
lines changed

‎Example Project Files/My Table.xml renamed to ‎Example Project Files/My Project.xml

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ProjectSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3-
<Date>2013-10-02T20:42:18.5887967+02:00</Date>
4-
<Name>My Table</Name>
3+
<Date>2018-12-03T10:23:44.2639199+01:00</Date>
4+
<Name>My Test Project</Name>
55
<TotalRecords>1000</TotalRecords>
66
<OutputFile>c:\Temp\output.sql</OutputFile>
77
<GenerateOptions xsi:type="GenerateOptionsSQL">
@@ -13,8 +13,8 @@
1313
<DataField>
1414
<Name>Numbers_Integer</Name>
1515
<FieldOptions xsi:type="FieldOptionsInteger">
16-
<ValueAsString>false</ValueAsString>
1716
<UseNullValues>false</UseNullValues>
17+
<ValueAsString>false</ValueAsString>
1818
<Min>0</Min>
1919
<Max>77778888</Max>
2020
</FieldOptions>
@@ -28,8 +28,8 @@
2828
<DataField>
2929
<Name>Human_First_Both</Name>
3030
<FieldOptions xsi:type="FieldOptionsFirstName">
31-
<ValueAsString>true</ValueAsString>
3231
<UseNullValues>false</UseNullValues>
32+
<ValueAsString>true</ValueAsString>
3333
<Male>true</Male>
3434
<Female>true</Female>
3535
</FieldOptions>
@@ -43,8 +43,8 @@
4343
<DataField>
4444
<Name>Human_Last</Name>
4545
<FieldOptions xsi:type="FieldOptionsLastName">
46-
<ValueAsString>true</ValueAsString>
4746
<UseNullValues>false</UseNullValues>
47+
<ValueAsString>true</ValueAsString>
4848
</FieldOptions>
4949
<Field>
5050
<FieldType>Human</FieldType>
@@ -56,8 +56,8 @@
5656
<DataField>
5757
<Name>Human_Full_Both</Name>
5858
<FieldOptions xsi:type="FieldOptionsFullName">
59-
<ValueAsString>true</ValueAsString>
6059
<UseNullValues>false</UseNullValues>
60+
<ValueAsString>true</ValueAsString>
6161
<Male>true</Male>
6262
<Female>true</Female>
6363
<Left2Right>true</Left2Right>
@@ -72,8 +72,8 @@
7272
<DataField>
7373
<Name>Human_Email</Name>
7474
<FieldOptions xsi:type="FieldOptionsEmailAddress">
75-
<ValueAsString>true</ValueAsString>
7675
<UseNullValues>true</UseNullValues>
76+
<ValueAsString>true</ValueAsString>
7777
<Male>true</Male>
7878
<Female>true</Female>
7979
<Left2Right>true</Left2Right>
@@ -88,8 +88,8 @@
8888
<DataField>
8989
<Name>Loc_City</Name>
9090
<FieldOptions xsi:type="FieldOptionsCity">
91-
<ValueAsString>true</ValueAsString>
9291
<UseNullValues>false</UseNullValues>
92+
<ValueAsString>true</ValueAsString>
9393
</FieldOptions>
9494
<Field>
9595
<FieldType>Location</FieldType>
@@ -101,8 +101,8 @@
101101
<DataField>
102102
<Name>Loc_Country</Name>
103103
<FieldOptions xsi:type="FieldOptionsCountry">
104-
<ValueAsString>true</ValueAsString>
105104
<UseNullValues>false</UseNullValues>
105+
<ValueAsString>true</ValueAsString>
106106
</FieldOptions>
107107
<Field>
108108
<FieldType>Location</FieldType>
@@ -114,8 +114,8 @@
114114
<DataField>
115115
<Name>Text_Words_3</Name>
116116
<FieldOptions xsi:type="FieldOptionsTextWords">
117-
<ValueAsString>true</ValueAsString>
118117
<UseNullValues>false</UseNullValues>
118+
<ValueAsString>true</ValueAsString>
119119
<Min>1</Min>
120120
<Max>3</Max>
121121
</FieldOptions>
@@ -129,8 +129,8 @@
129129
<DataField>
130130
<Name>Text_Random_4to8</Name>
131131
<FieldOptions xsi:type="FieldOptionsText">
132-
<ValueAsString>true</ValueAsString>
133132
<UseNullValues>false</UseNullValues>
133+
<ValueAsString>true</ValueAsString>
134134
<Min>4</Min>
135135
<Max>8</Max>
136136
<UseUppercase>false</UseUppercase>
@@ -150,15 +150,9 @@
150150
<DataField>
151151
<Name>Text_Pattern</Name>
152152
<FieldOptions xsi:type="FieldOptionsTextPattern">
153-
<ValueAsString>true</ValueAsString>
154153
<UseNullValues>false</UseNullValues>
154+
<ValueAsString>true</ValueAsString>
155155
<Pattern>\xLLnn_**ss\x</Pattern>
156-
<!-- <UseUppercase>false</UseUppercase> -->
157-
<!-- <UseLowercase>false</UseLowercase> -->
158-
<!-- <UseLetter>true</UseLetter> -->
159-
<!-- <UseNumber>true</UseNumber> -->
160-
<!-- <UseSpace>true</UseSpace> -->
161-
<!-- <UseSpecial>true</UseSpecial> -->
162156
</FieldOptions>
163157
<Field>
164158
<FieldType>Text</FieldType>
@@ -167,11 +161,25 @@
167161
<SubFieldType>TextPattern</SubFieldType>
168162
</SubField>
169163
</DataField>
164+
<DataField>
165+
<Name>Text_Regex</Name>
166+
<FieldOptions xsi:type="FieldOptionsTextRegex">
167+
<UseNullValues>false</UseNullValues>
168+
<ValueAsString>false</ValueAsString>
169+
<Pattern>[a-z]{4,8}</Pattern>
170+
</FieldOptions>
171+
<Field>
172+
<FieldType>Text</FieldType>
173+
</Field>
174+
<SubField>
175+
<SubFieldType>TextRegex</SubFieldType>
176+
</SubField>
177+
</DataField>
170178
<DataField>
171179
<Name>Set_StringList</Name>
172180
<FieldOptions xsi:type="FieldOptionsStringList">
173-
<ValueAsString>true</ValueAsString>
174181
<UseNullValues>false</UseNullValues>
182+
<ValueAsString>true</ValueAsString>
175183
<Values>
176184
<string>Active</string>
177185
<string>InActive</string>
@@ -188,10 +196,11 @@
188196
<DataField>
189197
<Name>Date_Time</Name>
190198
<FieldOptions xsi:type="FieldOptionsDateTime">
191-
<ValueAsString>true</ValueAsString>
192199
<UseNullValues>true</UseNullValues>
193-
<DateFrom>2013-08-30T00:00:00+02:00</DateFrom>
194-
<DateTo>2014-08-30T00:00:00+02:00</DateTo>
200+
<ValueAsString>true</ValueAsString>
201+
<Format>s</Format>
202+
<From>2018-12-03T00:00:00Z</From>
203+
<To>2019-12-03T00:00:00Z</To>
195204
<IncludeTime>true</IncludeTime>
196205
</FieldOptions>
197206
<Field>
@@ -204,8 +213,8 @@
204213
<DataField>
205214
<Name>IT_IPv4</Name>
206215
<FieldOptions xsi:type="FieldOptionsIPv4Address">
207-
<ValueAsString>true</ValueAsString>
208216
<UseNullValues>false</UseNullValues>
217+
<ValueAsString>true</ValueAsString>
209218
</FieldOptions>
210219
<Field>
211220
<FieldType>IT</FieldType>
@@ -217,8 +226,9 @@
217226
<DataField>
218227
<Name>IT_IPv6</Name>
219228
<FieldOptions xsi:type="FieldOptionsIPv6Address">
220-
<ValueAsString>true</ValueAsString>
221229
<UseNullValues>false</UseNullValues>
230+
<ValueAsString>true</ValueAsString>
231+
<Uppercase>false</Uppercase>
222232
</FieldOptions>
223233
<Field>
224234
<FieldType>IT</FieldType>
@@ -230,8 +240,10 @@
230240
<DataField>
231241
<Name>IT_MAC</Name>
232242
<FieldOptions xsi:type="FieldOptionsMACAddress">
233-
<ValueAsString>true</ValueAsString>
234243
<UseNullValues>false</UseNullValues>
244+
<ValueAsString>true</ValueAsString>
245+
<Separator>:</Separator>
246+
<Uppercase>true</Uppercase>
235247
</FieldOptions>
236248
<Field>
237249
<FieldType>IT</FieldType>
@@ -243,8 +255,9 @@
243255
<DataField>
244256
<Name>IT_Guid</Name>
245257
<FieldOptions xsi:type="FieldOptionsGuid">
246-
<ValueAsString>true</ValueAsString>
247258
<UseNullValues>false</UseNullValues>
259+
<ValueAsString>true</ValueAsString>
260+
<Uppercase>true</Uppercase>
248261
</FieldOptions>
249262
<Field>
250263
<FieldType>IT</FieldType>
@@ -254,4 +267,4 @@
254267
</SubField>
255268
</DataField>
256269
</DataFields>
257-
</ProjectSettings>
270+
</ProjectSettings>

‎src/ConsoleAppClassic/MainTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static void Run()
1515
string textRegex = randomizerTextRegex.Generate();
1616
Write(randomizerTextRegex, textRegex);
1717

18-
var randomizerIBAN1 = RandomizerFactory.GetRandomizer(new FieldOptionsIBAN());
18+
var randomizerIBAN1 = RandomizerFactory.GetRandomizer(new FieldOptionsIBAN { Type = "BOTH" });
1919
string IBAN1 = randomizerIBAN1.Generate();
2020
Write(randomizerIBAN1, IBAN1);
2121

‎src/RandomDataGenerator Solution.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RandomDataGenerator.Gui", "
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Example Project Files", "Example Project Files", "{E32DF9EB-603F-494D-A4BB-34CF2321F545}"
3232
ProjectSection(SolutionItems) = preProject
33-
..\Example Project Files\My Table.xml = ..\Example Project Files\My Table.xml
33+
..\Example Project Files\My Project.xml = ..\Example Project Files\My Project.xml
3434
EndProjectSection
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleAppNetCoreApp2", "ConsoleAppNetCoreApp2\ConsoleAppNetCoreApp2.csproj", "{6AB9BD42-8B23-425C-9B5D-B97A52F008BE}"

‎src/RandomDataGenerator Solution.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
22
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MAC/@EntryIndexedValue">MAC</s:String>
33
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
4+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">BBAN</s:String>
45
<s:Boolean x:Key="/Default/UserDictionary/Words/=Lipsum/@EntryIndexedValue">True</s:Boolean>
56
<s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizer/@EntryIndexedValue">True</s:Boolean>
67
<s:Boolean x:Key="/Default/UserDictionary/Words/=Randomizers/@EntryIndexedValue">True</s:Boolean>

‎src/RandomDataGenerator.Gui/Data/DataManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public DataManager()
6363
SubFields = new[] {
6464
new SubField { SubFieldType = SubFieldType.Text },
6565
new SubField { SubFieldType = SubFieldType.TextPattern },
66+
new SubField { SubFieldType = SubFieldType.TextRegex },
6667
new SubField { SubFieldType = SubFieldType.TextWords },
6768
// new SubField { SubFieldType = SubFieldType.TextLipsum }
6869
}

‎src/RandomDataGenerator.Gui/MainForm.Fields.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,17 @@ void UserControlExample_RefreshClicked(object sender, EventArgs e)
7474
private void UpdateUserControlExampleText(BaseUserControl baseUserControl)
7575
{
7676
var dummyDataField = new DataField(null, baseUserControl.GetFieldOptions(), null, null);
77-
var value = dummyDataField.Generate();
77+
78+
object value = "N/A";
79+
try
80+
{
81+
value = dummyDataField.Generate();
82+
}
83+
catch
84+
{
85+
// Just ignore exception
86+
}
87+
7888
userControlExample.txtExample.Text = value != null ? value.ToString() : "NULL";
7989
}
8090
#endregion

‎src/RandomDataGenerator.Gui/RandomDataGenerator.Gui.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@
124124
<Compile Include="UserControlsFields\UserControlIPv4Address.Designer.cs">
125125
<DependentUpon>UserControlIPv4Address.cs</DependentUpon>
126126
</Compile>
127+
<Compile Include="UserControlsFields\UserControlTextRegex.cs">
128+
<SubType>UserControl</SubType>
129+
</Compile>
130+
<Compile Include="UserControlsFields\UserControlTextRegex.Designer.cs">
131+
<DependentUpon>UserControlTextRegex.cs</DependentUpon>
132+
</Compile>
127133
<Compile Include="UserControls\BaseUserControl.cs">
128134
<SubType>UserControl</SubType>
129135
</Compile>
@@ -258,6 +264,9 @@
258264
<EmbeddedResource Include="UserControlsFields\UserControlMACAddress.resx">
259265
<DependentUpon>UserControlMACAddress.cs</DependentUpon>
260266
</EmbeddedResource>
267+
<EmbeddedResource Include="UserControlsFields\UserControlTextRegex.resx">
268+
<DependentUpon>UserControlTextRegex.cs</DependentUpon>
269+
</EmbeddedResource>
261270
<EmbeddedResource Include="UserControls\UserControlOutputSQL.resx">
262271
<DependentUpon>UserControlOutputSQL.cs</DependentUpon>
263272
</EmbeddedResource>

‎src/RandomDataGenerator.Gui/UserControlsFields/UserControlCommonOptions.Designer.cs

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/RandomDataGenerator.Gui/UserControlsFields/UserControlInteger.Designer.cs

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)