The Great Tuple to Symbol Rename (tm)
Rob Mensching committed
Jun 27, 2020 at 15:00 UTC
c57f5bc9caad2adf1b0fe8fedc1003e49e272080
8 files changed
+161
-161
src/wixext/SqlCompiler.cs
+16
-16
@@ -7,7 +7,7 @@ namespace WixToolset.Sql
7
using System.Xml.Linq;
8
using WixToolset.Data;
9
using WixToolset.Extensibility;
10
- using WixToolset.Sql.Tuples;
10
+ using WixToolset.Sql.Symbols;
11
12
/// <summary>
13
/// The compiler for the WiX Toolset SQL Server Extension.
@@ -319,7 +319,7 @@ namespace WixToolset.Sql
319
320
if (!this.Messaging.EncounteredError)
321
{
322
- var tuple = section.AddTuple(new SqlDatabaseTuple(sourceLineNumbers, id)
322
+ var symbol = section.AddSymbol(new SqlDatabaseSymbol(sourceLineNumbers, id)
323
{
324
Server = server,
325
Instance = instance,
@@ -332,7 +332,7 @@ namespace WixToolset.Sql
332
333
if (0 != attributes)
334
{
335
- tuple.Attributes = attributes;
335
+ symbol.Attributes = attributes;
336
}
337
}
338
}
@@ -408,7 +408,7 @@ namespace WixToolset.Sql
408
409
if (!this.Messaging.EncounteredError)
410
{
411
- var tuple = section.AddTuple(new SqlFileSpecTuple(sourceLineNumbers, id)
411
+ var symbol = section.AddSymbol(new SqlFileSpecSymbol(sourceLineNumbers, id)
412
{
413
Name = name,
414
Filename = fileName,
@@ -416,17 +416,17 @@ namespace WixToolset.Sql
416
417
if (null != size)
418
{
419
- tuple.Size = size;
419
+ symbol.Size = size;
420
}
421
422
if (null != maxSize)
423
{
424
- tuple.MaxSize = maxSize;
424
+ symbol.MaxSize = maxSize;
425
}
426
427
if (null != growthSize)
428
{
429
- tuple.GrowthSize = growthSize;
429
+ symbol.GrowthSize = growthSize;
430
}
431
}
432
@@ -461,7 +461,7 @@ namespace WixToolset.Sql
461
break;
462
case "BinaryKey":
463
binary = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
464
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Binary, binary);
464
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Binary, binary);
465
break;
466
case "Sequence":
467
sequence = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, short.MaxValue);
@@ -472,7 +472,7 @@ namespace WixToolset.Sql
472
this.Messaging.Write(ErrorMessages.IllegalAttributeWhenNested(sourceLineNumbers, element.Name.LocalName, attrib.Name.LocalName, element.Parent.Name.LocalName));
473
}
474
sqlDb = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
475
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlTupleDefinitions.SqlDatabase, sqlDb);
475
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlSymbolDefinitions.SqlDatabase, sqlDb);
476
break;
477
case "User":
478
user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
@@ -599,7 +599,7 @@ namespace WixToolset.Sql
599
600
if (!this.Messaging.EncounteredError)
601
{
602
- var tuple = section.AddTuple(new SqlScriptTuple(sourceLineNumbers, id)
602
+ var symbol = section.AddSymbol(new SqlScriptSymbol(sourceLineNumbers, id)
603
{
604
SqlDbRef = sqlDb,
605
ComponentRef = componentId,
@@ -610,7 +610,7 @@ namespace WixToolset.Sql
610
611
if (CompilerConstants.IntegerNotSet != sequence)
612
{
613
- tuple.Sequence = sequence;
613
+ symbol.Sequence = sequence;
614
}
615
}
616
}
@@ -735,7 +735,7 @@ namespace WixToolset.Sql
735
}
736
737
sqlDb = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
738
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlTupleDefinitions.SqlDatabase, sqlDb);
738
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SqlSymbolDefinitions.SqlDatabase, sqlDb);
739
break;
740
case "User":
741
user = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
@@ -779,7 +779,7 @@ namespace WixToolset.Sql
779
780
if (!this.Messaging.EncounteredError)
781
{
782
- var tuple = section.AddTuple(new SqlStringTuple(sourceLineNumbers, id)
782
+ var symbol = section.AddSymbol(new SqlStringSymbol(sourceLineNumbers, id)
783
{
784
SqlDbRef = sqlDb,
785
ComponentRef = componentId,
@@ -790,15 +790,15 @@ namespace WixToolset.Sql
790
791
if (CompilerConstants.IntegerNotSet != sequence)
792
{
793
- tuple.Sequence = sequence;
793
+ symbol.Sequence = sequence;
794
}
795
}
796
}
797
798
private void AddReferenceToInstallSqlData(IntermediateSection section, SourceLineNumber sourceLineNumbers)
799
{
800
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "InstallSqlData");
801
- this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.CustomAction, "UninstallSqlData");
800
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "InstallSqlData");
801
+ this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "UninstallSqlData");
802
}
803
}
804
}
src/wixext/SqlExtensionData.cs
+5
-5
@@ -16,15 +16,15 @@ namespace WixToolset.Sql
16
/// <value>The default culture.</value>
17
public override string DefaultCulture => "en-US";
18
19
- public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition)
19
+ public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
20
{
21
- tupleDefinition = SqlTupleDefinitions.ByName(name);
22
- return tupleDefinition != null;
21
+ symbolDefinition = SqlSymbolDefinitions.ByName(name);
22
+ return symbolDefinition != null;
23
}
24
25
- public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions)
25
+ public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions)
26
{
27
- return Intermediate.Load(typeof(SqlExtensionData).Assembly, "WixToolset.Sql.sql.wixlib", tupleDefinitions);
27
+ return Intermediate.Load(typeof(SqlExtensionData).Assembly, "WixToolset.Sql.sql.wixlib", symbolDefinitions);
28
}
29
}
30
}
src/wixext/SqlTableDefinitions.cs
+8
-8
@@ -8,7 +8,7 @@ namespace WixToolset.Sql
8
{
9
public static readonly TableDefinition SqlDatabase = new TableDefinition(
10
"SqlDatabase",
11
- SqlTupleDefinitions.SqlDatabase,
11
+ SqlSymbolDefinitions.SqlDatabase,
12
new[]
13
{
14
new ColumnDefinition("SqlDb", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -21,12 +21,12 @@ namespace WixToolset.Sql
21
new ColumnDefinition("FileSpec_Log", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Identifier, keyTable: "SqlFileSpec", keyColumn: 1, description: "Foreign key referencing SqlFileSpec.", modularizeType: ColumnModularizeType.Column),
22
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 255, description: "1 == create on install, 2 == drop on uninstall, 4 == continue on error, 8 == drop on install, 16 == create on uninstall, 32 == confirm update existing table, 64 == create on reinstall, 128 == drop on reinstall"),
23
},
24
- tupleIdIsPrimaryKey: true
24
+ symbolIdIsPrimaryKey: true
25
);
26
27
public static readonly TableDefinition SqlFileSpec = new TableDefinition(
28
"SqlFileSpec",
29
- SqlTupleDefinitions.SqlFileSpec,
29
+ SqlSymbolDefinitions.SqlFileSpec,
30
new[]
31
{
32
new ColumnDefinition("FileSpec", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token", modularizeType: ColumnModularizeType.Column),
@@ -36,12 +36,12 @@ namespace WixToolset.Sql
36
new ColumnDefinition("MaxSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Maximum size for file", modularizeType: ColumnModularizeType.Property),
37
new ColumnDefinition("GrowthSize", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Formatted, description: "Size file should grow when necessary", modularizeType: ColumnModularizeType.Property),
38
},
39
- tupleIdIsPrimaryKey: true
39
+ symbolIdIsPrimaryKey: true
40
);
41
42
public static readonly TableDefinition SqlScript = new TableDefinition(
43
"SqlScript",
44
- SqlTupleDefinitions.SqlScript,
44
+ SqlSymbolDefinitions.SqlScript,
45
new[]
46
{
47
new ColumnDefinition("Script", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Primary key, non-localized token"),
@@ -52,12 +52,12 @@ namespace WixToolset.Sql
52
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25;26;27;28;29;30;31", description: "1 == execute on install, 2 == execute on uninstall, 4 == continue on error, 8 == rollback on install, 16 == rollback on uninstall"),
53
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"),
54
},
55
- tupleIdIsPrimaryKey: true
55
+ symbolIdIsPrimaryKey: true
56
);
57
58
public static readonly TableDefinition SqlString = new TableDefinition(
59
"SqlString",
60
- SqlTupleDefinitions.SqlString,
60
+ SqlSymbolDefinitions.SqlString,
61
new[]
62
{
63
new ColumnDefinition("String", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "Id for the SqlString", modularizeType: ColumnModularizeType.Column),
@@ -68,7 +68,7 @@ namespace WixToolset.Sql
68
new ColumnDefinition("Attributes", ColumnType.Number, 2, primaryKey: false, nullable: false, ColumnCategory.Unknown, possibilities: "1;2;3;4;5;6;7;8;9;10;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25;26;27;28;29;30;31", description: "1 == execute on install, 2 == execute on uninstall, 4 == continue on error, 8 == rollback on install, 16 == rollback on uninstall"),
69
new ColumnDefinition("Sequence", ColumnType.Number, 2, primaryKey: false, nullable: true, ColumnCategory.Unknown, description: "Order to execute SQL Queries in"),
70
},
71
- tupleIdIsPrimaryKey: true
71
+ symbolIdIsPrimaryKey: true
72
);
73
74
public static readonly TableDefinition[] All = new[]
src/wixext/Tuples/SqlDatabaseTuple.cs
+35
-35
@@ -3,32 +3,32 @@
3
namespace WixToolset.Sql
4
{
5
using WixToolset.Data;
6
- using WixToolset.Sql.Tuples;
6
+ using WixToolset.Sql.Symbols;
7
8
- public static partial class SqlTupleDefinitions
8
+ public static partial class SqlSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition SqlDatabase = new IntermediateTupleDefinition(
11
- SqlTupleDefinitionType.SqlDatabase.ToString(),
10
+ public static readonly IntermediateSymbolDefinition SqlDatabase = new IntermediateSymbolDefinition(
11
+ SqlSymbolDefinitionType.SqlDatabase.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Server), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Instance), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Database), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.ComponentRef), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.UserRef), IntermediateFieldType.String),
19
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.FileSpecRef), IntermediateFieldType.String),
20
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.LogFileSpecRef), IntermediateFieldType.String),
21
- new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Attributes), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.Server), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.Instance), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.Database), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.ComponentRef), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.UserRef), IntermediateFieldType.String),
19
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.FileSpecRef), IntermediateFieldType.String),
20
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.LogFileSpecRef), IntermediateFieldType.String),
21
+ new IntermediateFieldDefinition(nameof(SqlDatabaseSymbolFields.Attributes), IntermediateFieldType.Number),
22
},
23
- typeof(SqlDatabaseTuple));
23
+ typeof(SqlDatabaseSymbol));
24
}
25
}
26
27
-namespace WixToolset.Sql.Tuples
27
+namespace WixToolset.Sql.Symbols
28
{
29
using WixToolset.Data;
30
31
- public enum SqlDatabaseTupleFields
31
+ public enum SqlDatabaseSymbolFields
32
{
33
Server,
34
Instance,
@@ -40,64 +40,64 @@ namespace WixToolset.Sql.Tuples
40
Attributes,
41
}
42
43
- public class SqlDatabaseTuple : IntermediateTuple
43
+ public class SqlDatabaseSymbol : IntermediateSymbol
44
{
45
- public SqlDatabaseTuple() : base(SqlTupleDefinitions.SqlDatabase, null, null)
45
+ public SqlDatabaseSymbol() : base(SqlSymbolDefinitions.SqlDatabase, null, null)
46
{
47
}
48
49
- public SqlDatabaseTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlTupleDefinitions.SqlDatabase, sourceLineNumber, id)
49
+ public SqlDatabaseSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlSymbolDefinitions.SqlDatabase, sourceLineNumber, id)
50
{
51
}
52
53
- public IntermediateField this[SqlDatabaseTupleFields index] => this.Fields[(int)index];
53
+ public IntermediateField this[SqlDatabaseSymbolFields index] => this.Fields[(int)index];
54
55
public string Server
56
{
57
- get => this.Fields[(int)SqlDatabaseTupleFields.Server].AsString();
58
- set => this.Set((int)SqlDatabaseTupleFields.Server, value);
57
+ get => this.Fields[(int)SqlDatabaseSymbolFields.Server].AsString();
58
+ set => this.Set((int)SqlDatabaseSymbolFields.Server, value);
59
}
60
61
public string Instance
62
{
63
- get => this.Fields[(int)SqlDatabaseTupleFields.Instance].AsString();
64
- set => this.Set((int)SqlDatabaseTupleFields.Instance, value);
63
+ get => this.Fields[(int)SqlDatabaseSymbolFields.Instance].AsString();
64
+ set => this.Set((int)SqlDatabaseSymbolFields.Instance, value);
65
}
66
67
public string Database
68
{
69
- get => this.Fields[(int)SqlDatabaseTupleFields.Database].AsString();
70
- set => this.Set((int)SqlDatabaseTupleFields.Database, value);
69
+ get => this.Fields[(int)SqlDatabaseSymbolFields.Database].AsString();
70
+ set => this.Set((int)SqlDatabaseSymbolFields.Database, value);
71
}
72
73
public string ComponentRef
74
{
75
- get => this.Fields[(int)SqlDatabaseTupleFields.ComponentRef].AsString();
76
- set => this.Set((int)SqlDatabaseTupleFields.ComponentRef, value);
75
+ get => this.Fields[(int)SqlDatabaseSymbolFields.ComponentRef].AsString();
76
+ set => this.Set((int)SqlDatabaseSymbolFields.ComponentRef, value);
77
}
78
79
public string UserRef
80
{
81
- get => this.Fields[(int)SqlDatabaseTupleFields.UserRef].AsString();
82
- set => this.Set((int)SqlDatabaseTupleFields.UserRef, value);
81
+ get => this.Fields[(int)SqlDatabaseSymbolFields.UserRef].AsString();
82
+ set => this.Set((int)SqlDatabaseSymbolFields.UserRef, value);
83
}
84
85
public string FileSpecRef
86
{
87
- get => this.Fields[(int)SqlDatabaseTupleFields.FileSpecRef].AsString();
88
- set => this.Set((int)SqlDatabaseTupleFields.FileSpecRef, value);
87
+ get => this.Fields[(int)SqlDatabaseSymbolFields.FileSpecRef].AsString();
88
+ set => this.Set((int)SqlDatabaseSymbolFields.FileSpecRef, value);
89
}
90
91
public string LogFileSpecRef
92
{
93
- get => this.Fields[(int)SqlDatabaseTupleFields.LogFileSpecRef].AsString();
94
- set => this.Set((int)SqlDatabaseTupleFields.LogFileSpecRef, value);
93
+ get => this.Fields[(int)SqlDatabaseSymbolFields.LogFileSpecRef].AsString();
94
+ set => this.Set((int)SqlDatabaseSymbolFields.LogFileSpecRef, value);
95
}
96
97
public int Attributes
98
{
99
- get => this.Fields[(int)SqlDatabaseTupleFields.Attributes].AsNumber();
100
- set => this.Set((int)SqlDatabaseTupleFields.Attributes, value);
99
+ get => this.Fields[(int)SqlDatabaseSymbolFields.Attributes].AsNumber();
100
+ set => this.Set((int)SqlDatabaseSymbolFields.Attributes, value);
101
}
102
}
103
}
\ No newline at end of file
src/wixext/Tuples/SqlFileSpecTuple.cs
+26
-26
@@ -3,29 +3,29 @@
3
namespace WixToolset.Sql
4
{
5
using WixToolset.Data;
6
- using WixToolset.Sql.Tuples;
6
+ using WixToolset.Sql.Symbols;
7
8
- public static partial class SqlTupleDefinitions
8
+ public static partial class SqlSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition SqlFileSpec = new IntermediateTupleDefinition(
11
- SqlTupleDefinitionType.SqlFileSpec.ToString(),
10
+ public static readonly IntermediateSymbolDefinition SqlFileSpec = new IntermediateSymbolDefinition(
11
+ SqlSymbolDefinitionType.SqlFileSpec.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Name), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Filename), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Size), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.MaxSize), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.GrowthSize), IntermediateFieldType.String),
14
+ new IntermediateFieldDefinition(nameof(SqlFileSpecSymbolFields.Name), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(SqlFileSpecSymbolFields.Filename), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(SqlFileSpecSymbolFields.Size), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(SqlFileSpecSymbolFields.MaxSize), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(SqlFileSpecSymbolFields.GrowthSize), IntermediateFieldType.String),
19
},
20
- typeof(SqlFileSpecTuple));
20
+ typeof(SqlFileSpecSymbol));
21
}
22
}
23
24
-namespace WixToolset.Sql.Tuples
24
+namespace WixToolset.Sql.Symbols
25
{
26
using WixToolset.Data;
27
28
- public enum SqlFileSpecTupleFields
28
+ public enum SqlFileSpecSymbolFields
29
{
30
Name,
31
Filename,
@@ -34,46 +34,46 @@ namespace WixToolset.Sql.Tuples
34
GrowthSize,
35
}
36
37
- public class SqlFileSpecTuple : IntermediateTuple
37
+ public class SqlFileSpecSymbol : IntermediateSymbol
38
{
39
- public SqlFileSpecTuple() : base(SqlTupleDefinitions.SqlFileSpec, null, null)
39
+ public SqlFileSpecSymbol() : base(SqlSymbolDefinitions.SqlFileSpec, null, null)
40
{
41
}
42
43
- public SqlFileSpecTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlTupleDefinitions.SqlFileSpec, sourceLineNumber, id)
43
+ public SqlFileSpecSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlSymbolDefinitions.SqlFileSpec, sourceLineNumber, id)
44
{
45
}
46
47
- public IntermediateField this[SqlFileSpecTupleFields index] => this.Fields[(int)index];
47
+ public IntermediateField this[SqlFileSpecSymbolFields index] => this.Fields[(int)index];
48
49
public string Name
50
{
51
- get => this.Fields[(int)SqlFileSpecTupleFields.Name].AsString();
52
- set => this.Set((int)SqlFileSpecTupleFields.Name, value);
51
+ get => this.Fields[(int)SqlFileSpecSymbolFields.Name].AsString();
52
+ set => this.Set((int)SqlFileSpecSymbolFields.Name, value);
53
}
54
55
public string Filename
56
{
57
- get => this.Fields[(int)SqlFileSpecTupleFields.Filename].AsString();
58
- set => this.Set((int)SqlFileSpecTupleFields.Filename, value);
57
+ get => this.Fields[(int)SqlFileSpecSymbolFields.Filename].AsString();
58
+ set => this.Set((int)SqlFileSpecSymbolFields.Filename, value);
59
}
60
61
public string Size
62
{
63
- get => this.Fields[(int)SqlFileSpecTupleFields.Size].AsString();
64
- set => this.Set((int)SqlFileSpecTupleFields.Size, value);
63
+ get => this.Fields[(int)SqlFileSpecSymbolFields.Size].AsString();
64
+ set => this.Set((int)SqlFileSpecSymbolFields.Size, value);
65
}
66
67
public string MaxSize
68
{
69
- get => this.Fields[(int)SqlFileSpecTupleFields.MaxSize].AsString();
70
- set => this.Set((int)SqlFileSpecTupleFields.MaxSize, value);
69
+ get => this.Fields[(int)SqlFileSpecSymbolFields.MaxSize].AsString();
70
+ set => this.Set((int)SqlFileSpecSymbolFields.MaxSize, value);
71
}
72
73
public string GrowthSize
74
{
75
- get => this.Fields[(int)SqlFileSpecTupleFields.GrowthSize].AsString();
76
- set => this.Set((int)SqlFileSpecTupleFields.GrowthSize, value);
75
+ get => this.Fields[(int)SqlFileSpecSymbolFields.GrowthSize].AsString();
76
+ set => this.Set((int)SqlFileSpecSymbolFields.GrowthSize, value);
77
}
78
}
79
}
\ No newline at end of file
src/wixext/Tuples/SqlScriptTuple.cs
+29
-29
@@ -3,30 +3,30 @@
3
namespace WixToolset.Sql
4
{
5
using WixToolset.Data;
6
- using WixToolset.Sql.Tuples;
6
+ using WixToolset.Sql.Symbols;
7
8
- public static partial class SqlTupleDefinitions
8
+ public static partial class SqlSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition SqlScript = new IntermediateTupleDefinition(
11
- SqlTupleDefinitionType.SqlScript.ToString(),
10
+ public static readonly IntermediateSymbolDefinition SqlScript = new IntermediateSymbolDefinition(
11
+ SqlSymbolDefinitionType.SqlScript.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.SqlDbRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.ComponentRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.ScriptBinaryRef), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.UserRef), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Attributes), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Sequence), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.SqlDbRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.ComponentRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.ScriptBinaryRef), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.UserRef), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.Attributes), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(SqlScriptSymbolFields.Sequence), IntermediateFieldType.Number),
20
},
21
- typeof(SqlScriptTuple));
21
+ typeof(SqlScriptSymbol));
22
}
23
}
24
25
-namespace WixToolset.Sql.Tuples
25
+namespace WixToolset.Sql.Symbols
26
{
27
using WixToolset.Data;
28
29
- public enum SqlScriptTupleFields
29
+ public enum SqlScriptSymbolFields
30
{
31
SqlDbRef,
32
ComponentRef,
@@ -36,52 +36,52 @@ namespace WixToolset.Sql.Tuples
36
Sequence,
37
}
38
39
- public class SqlScriptTuple : IntermediateTuple
39
+ public class SqlScriptSymbol : IntermediateSymbol
40
{
41
- public SqlScriptTuple() : base(SqlTupleDefinitions.SqlScript, null, null)
41
+ public SqlScriptSymbol() : base(SqlSymbolDefinitions.SqlScript, null, null)
42
{
43
}
44
45
- public SqlScriptTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlTupleDefinitions.SqlScript, sourceLineNumber, id)
45
+ public SqlScriptSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlSymbolDefinitions.SqlScript, sourceLineNumber, id)
46
{
47
}
48
49
- public IntermediateField this[SqlScriptTupleFields index] => this.Fields[(int)index];
49
+ public IntermediateField this[SqlScriptSymbolFields index] => this.Fields[(int)index];
50
51
public string SqlDbRef
52
{
53
- get => this.Fields[(int)SqlScriptTupleFields.SqlDbRef].AsString();
54
- set => this.Set((int)SqlScriptTupleFields.SqlDbRef, value);
53
+ get => this.Fields[(int)SqlScriptSymbolFields.SqlDbRef].AsString();
54
+ set => this.Set((int)SqlScriptSymbolFields.SqlDbRef, value);
55
}
56
57
public string ComponentRef
58
{
59
- get => this.Fields[(int)SqlScriptTupleFields.ComponentRef].AsString();
60
- set => this.Set((int)SqlScriptTupleFields.ComponentRef, value);
59
+ get => this.Fields[(int)SqlScriptSymbolFields.ComponentRef].AsString();
60
+ set => this.Set((int)SqlScriptSymbolFields.ComponentRef, value);
61
}
62
63
public string ScriptBinaryRef
64
{
65
- get => this.Fields[(int)SqlScriptTupleFields.ScriptBinaryRef].AsString();
66
- set => this.Set((int)SqlScriptTupleFields.ScriptBinaryRef, value);
65
+ get => this.Fields[(int)SqlScriptSymbolFields.ScriptBinaryRef].AsString();
66
+ set => this.Set((int)SqlScriptSymbolFields.ScriptBinaryRef, value);
67
}
68
69
public string UserRef
70
{
71
- get => this.Fields[(int)SqlScriptTupleFields.UserRef].AsString();
72
- set => this.Set((int)SqlScriptTupleFields.UserRef, value);
71
+ get => this.Fields[(int)SqlScriptSymbolFields.UserRef].AsString();
72
+ set => this.Set((int)SqlScriptSymbolFields.UserRef, value);
73
}
74
75
public int Attributes
76
{
77
- get => this.Fields[(int)SqlScriptTupleFields.Attributes].AsNumber();
78
- set => this.Set((int)SqlScriptTupleFields.Attributes, value);
77
+ get => this.Fields[(int)SqlScriptSymbolFields.Attributes].AsNumber();
78
+ set => this.Set((int)SqlScriptSymbolFields.Attributes, value);
79
}
80
81
public int? Sequence
82
{
83
- get => this.Fields[(int)SqlScriptTupleFields.Sequence].AsNullableNumber();
84
- set => this.Set((int)SqlScriptTupleFields.Sequence, value);
83
+ get => this.Fields[(int)SqlScriptSymbolFields.Sequence].AsNullableNumber();
84
+ set => this.Set((int)SqlScriptSymbolFields.Sequence, value);
85
}
86
}
87
}
\ No newline at end of file
src/wixext/Tuples/SqlStringTuple.cs
+29
-29
@@ -3,30 +3,30 @@
3
namespace WixToolset.Sql
4
{
5
using WixToolset.Data;
6
- using WixToolset.Sql.Tuples;
6
+ using WixToolset.Sql.Symbols;
7
8
- public static partial class SqlTupleDefinitions
8
+ public static partial class SqlSymbolDefinitions
9
{
10
- public static readonly IntermediateTupleDefinition SqlString = new IntermediateTupleDefinition(
11
- SqlTupleDefinitionType.SqlString.ToString(),
10
+ public static readonly IntermediateSymbolDefinition SqlString = new IntermediateSymbolDefinition(
11
+ SqlSymbolDefinitionType.SqlString.ToString(),
12
new[]
13
{
14
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SqlDbRef), IntermediateFieldType.String),
15
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.ComponentRef), IntermediateFieldType.String),
16
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SQL), IntermediateFieldType.String),
17
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.UserRef), IntermediateFieldType.String),
18
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Attributes), IntermediateFieldType.Number),
19
- new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Sequence), IntermediateFieldType.Number),
14
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.SqlDbRef), IntermediateFieldType.String),
15
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.ComponentRef), IntermediateFieldType.String),
16
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.SQL), IntermediateFieldType.String),
17
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.UserRef), IntermediateFieldType.String),
18
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.Attributes), IntermediateFieldType.Number),
19
+ new IntermediateFieldDefinition(nameof(SqlStringSymbolFields.Sequence), IntermediateFieldType.Number),
20
},
21
- typeof(SqlStringTuple));
21
+ typeof(SqlStringSymbol));
22
}
23
}
24
25
-namespace WixToolset.Sql.Tuples
25
+namespace WixToolset.Sql.Symbols
26
{
27
using WixToolset.Data;
28
29
- public enum SqlStringTupleFields
29
+ public enum SqlStringSymbolFields
30
{
31
SqlDbRef,
32
ComponentRef,
@@ -36,52 +36,52 @@ namespace WixToolset.Sql.Tuples
36
Sequence,
37
}
38
39
- public class SqlStringTuple : IntermediateTuple
39
+ public class SqlStringSymbol : IntermediateSymbol
40
{
41
- public SqlStringTuple() : base(SqlTupleDefinitions.SqlString, null, null)
41
+ public SqlStringSymbol() : base(SqlSymbolDefinitions.SqlString, null, null)
42
{
43
}
44
45
- public SqlStringTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlTupleDefinitions.SqlString, sourceLineNumber, id)
45
+ public SqlStringSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SqlSymbolDefinitions.SqlString, sourceLineNumber, id)
46
{
47
}
48
49
- public IntermediateField this[SqlStringTupleFields index] => this.Fields[(int)index];
49
+ public IntermediateField this[SqlStringSymbolFields index] => this.Fields[(int)index];
50
51
public string SqlDbRef
52
{
53
- get => this.Fields[(int)SqlStringTupleFields.SqlDbRef].AsString();
54
- set => this.Set((int)SqlStringTupleFields.SqlDbRef, value);
53
+ get => this.Fields[(int)SqlStringSymbolFields.SqlDbRef].AsString();
54
+ set => this.Set((int)SqlStringSymbolFields.SqlDbRef, value);
55
}
56
57
public string ComponentRef
58
{
59
- get => this.Fields[(int)SqlStringTupleFields.ComponentRef].AsString();
60
- set => this.Set((int)SqlStringTupleFields.ComponentRef, value);
59
+ get => this.Fields[(int)SqlStringSymbolFields.ComponentRef].AsString();
60
+ set => this.Set((int)SqlStringSymbolFields.ComponentRef, value);
61
}
62
63
public string SQL
64
{
65
- get => this.Fields[(int)SqlStringTupleFields.SQL].AsString();
66
- set => this.Set((int)SqlStringTupleFields.SQL, value);
65
+ get => this.Fields[(int)SqlStringSymbolFields.SQL].AsString();
66
+ set => this.Set((int)SqlStringSymbolFields.SQL, value);
67
}
68
69
public string UserRef
70
{
71
- get => this.Fields[(int)SqlStringTupleFields.UserRef].AsString();
72
- set => this.Set((int)SqlStringTupleFields.UserRef, value);
71
+ get => this.Fields[(int)SqlStringSymbolFields.UserRef].AsString();
72
+ set => this.Set((int)SqlStringSymbolFields.UserRef, value);
73
}
74
75
public int Attributes
76
{
77
- get => this.Fields[(int)SqlStringTupleFields.Attributes].AsNumber();
78
- set => this.Set((int)SqlStringTupleFields.Attributes, value);
77
+ get => this.Fields[(int)SqlStringSymbolFields.Attributes].AsNumber();
78
+ set => this.Set((int)SqlStringSymbolFields.Attributes, value);
79
}
80
81
public int? Sequence
82
{
83
- get => this.Fields[(int)SqlStringTupleFields.Sequence].AsNullableNumber();
84
- set => this.Set((int)SqlStringTupleFields.Sequence, value);
83
+ get => this.Fields[(int)SqlStringSymbolFields.Sequence].AsNullableNumber();
84
+ set => this.Set((int)SqlStringSymbolFields.Sequence, value);
85
}
86
}
87
}
\ No newline at end of file
src/wixext/Tuples/SqlTupleDefinitions.cs
+13
-13
@@ -5,7 +5,7 @@ namespace WixToolset.Sql
5
using System;
6
using WixToolset.Data;
7
8
- public enum SqlTupleDefinitionType
8
+ public enum SqlSymbolDefinitionType
9
{
10
SqlDatabase,
11
SqlFileSpec,
@@ -13,13 +13,13 @@ namespace WixToolset.Sql
13
SqlString,
14
}
15
16
- public static partial class SqlTupleDefinitions
16
+ public static partial class SqlSymbolDefinitions
17
{
18
public static readonly Version Version = new Version("4.0.0");
19
20
- public static IntermediateTupleDefinition ByName(string name)
20
+ public static IntermediateSymbolDefinition ByName(string name)
21
{
22
- if (!Enum.TryParse(name, out SqlTupleDefinitionType type))
22
+ if (!Enum.TryParse(name, out SqlSymbolDefinitionType type))
23
{
24
return null;
25
}
@@ -27,21 +27,21 @@ namespace WixToolset.Sql
27
return ByType(type);
28
}
29
30
- public static IntermediateTupleDefinition ByType(SqlTupleDefinitionType type)
30
+ public static IntermediateSymbolDefinition ByType(SqlSymbolDefinitionType type)
31
{
32
switch (type)
33
{
34
- case SqlTupleDefinitionType.SqlDatabase:
35
- return SqlTupleDefinitions.SqlDatabase;
34
+ case SqlSymbolDefinitionType.SqlDatabase:
35
+ return SqlSymbolDefinitions.SqlDatabase;
36
37
- case SqlTupleDefinitionType.SqlFileSpec:
38
- return SqlTupleDefinitions.SqlFileSpec;
37
+ case SqlSymbolDefinitionType.SqlFileSpec:
38
+ return SqlSymbolDefinitions.SqlFileSpec;
39
40
- case SqlTupleDefinitionType.SqlScript:
41
- return SqlTupleDefinitions.SqlScript;
40
+ case SqlSymbolDefinitionType.SqlScript:
41
+ return SqlSymbolDefinitions.SqlScript;
42
43
- case SqlTupleDefinitionType.SqlString:
44
- return SqlTupleDefinitions.SqlString;
43
+ case SqlSymbolDefinitionType.SqlString:
44
+ return SqlSymbolDefinitions.SqlString;
45
46
default:
47
throw new ArgumentOutOfRangeException(nameof(type));