aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/Tuples
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/Tuples')
-rw-r--r--src/wixext/Tuples/SqlDatabaseTuple.cs48
-rw-r--r--src/wixext/Tuples/SqlFileSpecTuple.cs8
-rw-r--r--src/wixext/Tuples/SqlScriptTuple.cs48
-rw-r--r--src/wixext/Tuples/SqlStringTuple.cs38
4 files changed, 55 insertions, 87 deletions
diff --git a/src/wixext/Tuples/SqlDatabaseTuple.cs b/src/wixext/Tuples/SqlDatabaseTuple.cs
index fd107690..1e056212 100644
--- a/src/wixext/Tuples/SqlDatabaseTuple.cs
+++ b/src/wixext/Tuples/SqlDatabaseTuple.cs
@@ -11,14 +11,13 @@ namespace WixToolset.Sql
11 SqlTupleDefinitionType.SqlDatabase.ToString(), 11 SqlTupleDefinitionType.SqlDatabase.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.SqlDb), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Server), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Server), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Instance), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Instance), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Database), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Database), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Component_), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.ComponentRef), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.User_), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.UserRef), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.FileSpec_), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.FileSpecRef), IntermediateFieldType.String),
21 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.FileSpec_Log), IntermediateFieldType.String), 20 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.LogFileSpecRef), IntermediateFieldType.String),
22 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Attributes), IntermediateFieldType.Number), 21 new IntermediateFieldDefinition(nameof(SqlDatabaseTupleFields.Attributes), IntermediateFieldType.Number),
23 }, 22 },
24 typeof(SqlDatabaseTuple)); 23 typeof(SqlDatabaseTuple));
@@ -31,14 +30,13 @@ namespace WixToolset.Sql.Tuples
31 30
32 public enum SqlDatabaseTupleFields 31 public enum SqlDatabaseTupleFields
33 { 32 {
34 SqlDb,
35 Server, 33 Server,
36 Instance, 34 Instance,
37 Database, 35 Database,
38 Component_, 36 ComponentRef,
39 User_, 37 UserRef,
40 FileSpec_, 38 FileSpecRef,
41 FileSpec_Log, 39 LogFileSpecRef,
42 Attributes, 40 Attributes,
43 } 41 }
44 42
@@ -54,12 +52,6 @@ namespace WixToolset.Sql.Tuples
54 52
55 public IntermediateField this[SqlDatabaseTupleFields index] => this.Fields[(int)index]; 53 public IntermediateField this[SqlDatabaseTupleFields index] => this.Fields[(int)index];
56 54
57 public string SqlDb
58 {
59 get => this.Fields[(int)SqlDatabaseTupleFields.SqlDb].AsString();
60 set => this.Set((int)SqlDatabaseTupleFields.SqlDb, value);
61 }
62
63 public string Server 55 public string Server
64 { 56 {
65 get => this.Fields[(int)SqlDatabaseTupleFields.Server].AsString(); 57 get => this.Fields[(int)SqlDatabaseTupleFields.Server].AsString();
@@ -78,28 +70,28 @@ namespace WixToolset.Sql.Tuples
78 set => this.Set((int)SqlDatabaseTupleFields.Database, value); 70 set => this.Set((int)SqlDatabaseTupleFields.Database, value);
79 } 71 }
80 72
81 public string Component_ 73 public string ComponentRef
82 { 74 {
83 get => this.Fields[(int)SqlDatabaseTupleFields.Component_].AsString(); 75 get => this.Fields[(int)SqlDatabaseTupleFields.ComponentRef].AsString();
84 set => this.Set((int)SqlDatabaseTupleFields.Component_, value); 76 set => this.Set((int)SqlDatabaseTupleFields.ComponentRef, value);
85 } 77 }
86 78
87 public string User_ 79 public string UserRef
88 { 80 {
89 get => this.Fields[(int)SqlDatabaseTupleFields.User_].AsString(); 81 get => this.Fields[(int)SqlDatabaseTupleFields.UserRef].AsString();
90 set => this.Set((int)SqlDatabaseTupleFields.User_, value); 82 set => this.Set((int)SqlDatabaseTupleFields.UserRef, value);
91 } 83 }
92 84
93 public string FileSpec_ 85 public string FileSpecRef
94 { 86 {
95 get => this.Fields[(int)SqlDatabaseTupleFields.FileSpec_].AsString(); 87 get => this.Fields[(int)SqlDatabaseTupleFields.FileSpecRef].AsString();
96 set => this.Set((int)SqlDatabaseTupleFields.FileSpec_, value); 88 set => this.Set((int)SqlDatabaseTupleFields.FileSpecRef, value);
97 } 89 }
98 90
99 public string FileSpec_Log 91 public string LogFileSpecRef
100 { 92 {
101 get => this.Fields[(int)SqlDatabaseTupleFields.FileSpec_Log].AsString(); 93 get => this.Fields[(int)SqlDatabaseTupleFields.LogFileSpecRef].AsString();
102 set => this.Set((int)SqlDatabaseTupleFields.FileSpec_Log, value); 94 set => this.Set((int)SqlDatabaseTupleFields.LogFileSpecRef, value);
103 } 95 }
104 96
105 public int Attributes 97 public int Attributes
diff --git a/src/wixext/Tuples/SqlFileSpecTuple.cs b/src/wixext/Tuples/SqlFileSpecTuple.cs
index 9813ec83..98a3002b 100644
--- a/src/wixext/Tuples/SqlFileSpecTuple.cs
+++ b/src/wixext/Tuples/SqlFileSpecTuple.cs
@@ -11,7 +11,6 @@ namespace WixToolset.Sql
11 SqlTupleDefinitionType.SqlFileSpec.ToString(), 11 SqlTupleDefinitionType.SqlFileSpec.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.FileSpec), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Name), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Name), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Filename), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Filename), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Size), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(SqlFileSpecTupleFields.Size), IntermediateFieldType.String),
@@ -28,7 +27,6 @@ namespace WixToolset.Sql.Tuples
28 27
29 public enum SqlFileSpecTupleFields 28 public enum SqlFileSpecTupleFields
30 { 29 {
31 FileSpec,
32 Name, 30 Name,
33 Filename, 31 Filename,
34 Size, 32 Size,
@@ -48,12 +46,6 @@ namespace WixToolset.Sql.Tuples
48 46
49 public IntermediateField this[SqlFileSpecTupleFields index] => this.Fields[(int)index]; 47 public IntermediateField this[SqlFileSpecTupleFields index] => this.Fields[(int)index];
50 48
51 public string FileSpec
52 {
53 get => this.Fields[(int)SqlFileSpecTupleFields.FileSpec].AsString();
54 set => this.Set((int)SqlFileSpecTupleFields.FileSpec, value);
55 }
56
57 public string Name 49 public string Name
58 { 50 {
59 get => this.Fields[(int)SqlFileSpecTupleFields.Name].AsString(); 51 get => this.Fields[(int)SqlFileSpecTupleFields.Name].AsString();
diff --git a/src/wixext/Tuples/SqlScriptTuple.cs b/src/wixext/Tuples/SqlScriptTuple.cs
index b1f95709..de76d49d 100644
--- a/src/wixext/Tuples/SqlScriptTuple.cs
+++ b/src/wixext/Tuples/SqlScriptTuple.cs
@@ -11,11 +11,10 @@ namespace WixToolset.Sql
11 SqlTupleDefinitionType.SqlScript.ToString(), 11 SqlTupleDefinitionType.SqlScript.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Script), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.SqlDbRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.SqlDb_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Component_), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.ScriptBinaryRef), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.ScriptBinary_), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.UserRef), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.User_), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Attributes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Attributes), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Sequence), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(SqlScriptTupleFields.Sequence), IntermediateFieldType.Number),
21 }, 20 },
@@ -29,11 +28,10 @@ namespace WixToolset.Sql.Tuples
29 28
30 public enum SqlScriptTupleFields 29 public enum SqlScriptTupleFields
31 { 30 {
32 Script, 31 SqlDbRef,
33 SqlDb_, 32 ComponentRef,
34 Component_, 33 ScriptBinaryRef,
35 ScriptBinary_, 34 UserRef,
36 User_,
37 Attributes, 35 Attributes,
38 Sequence, 36 Sequence,
39 } 37 }
@@ -50,34 +48,28 @@ namespace WixToolset.Sql.Tuples
50 48
51 public IntermediateField this[SqlScriptTupleFields index] => this.Fields[(int)index]; 49 public IntermediateField this[SqlScriptTupleFields index] => this.Fields[(int)index];
52 50
53 public string Script 51 public string SqlDbRef
54 { 52 {
55 get => this.Fields[(int)SqlScriptTupleFields.Script].AsString(); 53 get => this.Fields[(int)SqlScriptTupleFields.SqlDbRef].AsString();
56 set => this.Set((int)SqlScriptTupleFields.Script, value); 54 set => this.Set((int)SqlScriptTupleFields.SqlDbRef, value);
57 } 55 }
58 56
59 public string SqlDb_ 57 public string ComponentRef
60 { 58 {
61 get => this.Fields[(int)SqlScriptTupleFields.SqlDb_].AsString(); 59 get => this.Fields[(int)SqlScriptTupleFields.ComponentRef].AsString();
62 set => this.Set((int)SqlScriptTupleFields.SqlDb_, value); 60 set => this.Set((int)SqlScriptTupleFields.ComponentRef, value);
63 } 61 }
64 62
65 public string Component_ 63 public string ScriptBinaryRef
66 { 64 {
67 get => this.Fields[(int)SqlScriptTupleFields.Component_].AsString(); 65 get => this.Fields[(int)SqlScriptTupleFields.ScriptBinaryRef].AsString();
68 set => this.Set((int)SqlScriptTupleFields.Component_, value); 66 set => this.Set((int)SqlScriptTupleFields.ScriptBinaryRef, value);
69 } 67 }
70 68
71 public string ScriptBinary_ 69 public string UserRef
72 { 70 {
73 get => this.Fields[(int)SqlScriptTupleFields.ScriptBinary_].AsString(); 71 get => this.Fields[(int)SqlScriptTupleFields.UserRef].AsString();
74 set => this.Set((int)SqlScriptTupleFields.ScriptBinary_, value); 72 set => this.Set((int)SqlScriptTupleFields.UserRef, value);
75 }
76
77 public string User_
78 {
79 get => this.Fields[(int)SqlScriptTupleFields.User_].AsString();
80 set => this.Set((int)SqlScriptTupleFields.User_, value);
81 } 73 }
82 74
83 public int Attributes 75 public int Attributes
diff --git a/src/wixext/Tuples/SqlStringTuple.cs b/src/wixext/Tuples/SqlStringTuple.cs
index d2cba0e0..77882d33 100644
--- a/src/wixext/Tuples/SqlStringTuple.cs
+++ b/src/wixext/Tuples/SqlStringTuple.cs
@@ -11,11 +11,10 @@ namespace WixToolset.Sql
11 SqlTupleDefinitionType.SqlString.ToString(), 11 SqlTupleDefinitionType.SqlString.ToString(),
12 new[] 12 new[]
13 { 13 {
14 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.String), IntermediateFieldType.String), 14 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SqlDbRef), IntermediateFieldType.String),
15 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SqlDb_), IntermediateFieldType.String), 15 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.ComponentRef), IntermediateFieldType.String),
16 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Component_), IntermediateFieldType.String),
17 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SQL), IntermediateFieldType.String), 16 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.SQL), IntermediateFieldType.String),
18 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.User_), IntermediateFieldType.String), 17 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.UserRef), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Attributes), IntermediateFieldType.Number), 18 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Attributes), IntermediateFieldType.Number),
20 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Sequence), IntermediateFieldType.Number), 19 new IntermediateFieldDefinition(nameof(SqlStringTupleFields.Sequence), IntermediateFieldType.Number),
21 }, 20 },
@@ -29,11 +28,10 @@ namespace WixToolset.Sql.Tuples
29 28
30 public enum SqlStringTupleFields 29 public enum SqlStringTupleFields
31 { 30 {
32 String, 31 SqlDbRef,
33 SqlDb_, 32 ComponentRef,
34 Component_,
35 SQL, 33 SQL,
36 User_, 34 UserRef,
37 Attributes, 35 Attributes,
38 Sequence, 36 Sequence,
39 } 37 }
@@ -50,22 +48,16 @@ namespace WixToolset.Sql.Tuples
50 48
51 public IntermediateField this[SqlStringTupleFields index] => this.Fields[(int)index]; 49 public IntermediateField this[SqlStringTupleFields index] => this.Fields[(int)index];
52 50
53 public string String 51 public string SqlDbRef
54 { 52 {
55 get => this.Fields[(int)SqlStringTupleFields.String].AsString(); 53 get => this.Fields[(int)SqlStringTupleFields.SqlDbRef].AsString();
56 set => this.Set((int)SqlStringTupleFields.String, value); 54 set => this.Set((int)SqlStringTupleFields.SqlDbRef, value);
57 } 55 }
58 56
59 public string SqlDb_ 57 public string ComponentRef
60 { 58 {
61 get => this.Fields[(int)SqlStringTupleFields.SqlDb_].AsString(); 59 get => this.Fields[(int)SqlStringTupleFields.ComponentRef].AsString();
62 set => this.Set((int)SqlStringTupleFields.SqlDb_, value); 60 set => this.Set((int)SqlStringTupleFields.ComponentRef, value);
63 }
64
65 public string Component_
66 {
67 get => this.Fields[(int)SqlStringTupleFields.Component_].AsString();
68 set => this.Set((int)SqlStringTupleFields.Component_, value);
69 } 61 }
70 62
71 public string SQL 63 public string SQL
@@ -74,10 +66,10 @@ namespace WixToolset.Sql.Tuples
74 set => this.Set((int)SqlStringTupleFields.SQL, value); 66 set => this.Set((int)SqlStringTupleFields.SQL, value);
75 } 67 }
76 68
77 public string User_ 69 public string UserRef
78 { 70 {
79 get => this.Fields[(int)SqlStringTupleFields.User_].AsString(); 71 get => this.Fields[(int)SqlStringTupleFields.UserRef].AsString();
80 set => this.Set((int)SqlStringTupleFields.User_, value); 72 set => this.Set((int)SqlStringTupleFields.UserRef, value);
81 } 73 }
82 74
83 public int Attributes 75 public int Attributes