diff options
Diffstat (limited to 'src/wixext/Tuples/SqlDatabaseTuple.cs')
-rw-r--r-- | src/wixext/Tuples/SqlDatabaseTuple.cs | 48 |
1 files changed, 20 insertions, 28 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 |