Skip to content

Commit c5494c5

Browse files
committed
Version 1.1
1 parent 8af79a8 commit c5494c5

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

Client/PowerQueryCommand.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ public string Mashup
8484
/// <returns></returns>
8585
public ExecuteResponse Execute(ExecuteRequest executeRequest)
8686
{
87+
if (executeRequest.Credentials == null || executeRequest.Credentials.Count == 0)
88+
executeRequest.Credentials = this.Credentials;
89+
90+
if (executeRequest.Mashup == null)
91+
executeRequest.Mashup = this.Mashup;
92+
93+
if (executeRequest.Queries == null || executeRequest.Queries.Count == 0)
94+
executeRequest.Queries = this.Queries;
95+
8796
return ExecuteMethod("Execute", executeRequest);
8897
}
8998

@@ -94,7 +103,7 @@ public ExecuteResponse Execute(ExecuteRequest executeRequest)
94103
/// <returns></returns>
95104
public ExecuteResponse Execute(string queryName)
96105
{
97-
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Queries = this.Queries, Credentials = this.Credentials, Mashup = this.Mashup });
106+
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Queries = this.Queries, Credentials = this.Credentials, Mashup = this.Mashup, ExecuteOutputFlags = ExecuteOutputFlags.DataTable });
98107
}
99108

100109
/// <summary>
@@ -107,7 +116,7 @@ public ExecuteResponse Execute(Query query)
107116
if (Queries[query.Name] == null)
108117
Queries.Add(query);
109118

110-
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = query.Name, Queries = this.Queries, Credentials = this.Credentials, Mashup = this.Mashup });
119+
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = query.Name, Queries = this.Queries, Credentials = this.Credentials, Mashup = this.Mashup, ExecuteOutputFlags = ExecuteOutputFlags.DataTable });
111120
}
112121

113122
/// <summary>
@@ -120,7 +129,7 @@ public ExecuteResponse Execute(Query query)
120129
public static ExecuteResponse Execute(string queryName, Queries queries, Credentials credentials = null)
121130
{
122131
//return ExecuteMethod("Execute", queryName, queries.ToArray(), credentials);
123-
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Queries = queries, Credentials = credentials });
132+
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Queries = queries, Credentials = credentials, ExecuteOutputFlags = ExecuteOutputFlags.DataTable });
124133
}
125134

126135
/// <summary>
@@ -133,7 +142,7 @@ public static ExecuteResponse Execute(string queryName, Queries queries, Credent
133142
public static ExecuteResponse Execute(string queryName, string mashup, Credentials credentials = null)
134143
{
135144
//return ExecuteMethod("Execute", queryName, queries.ToArray(), credentials);
136-
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Mashup = mashup, Credentials = credentials });
145+
return ExecuteMethod("Execute", new ExecuteRequest { QueryName = queryName, Mashup = mashup, Credentials = credentials, ExecuteOutputFlags = ExecuteOutputFlags.DataTable });
137146
}
138147

139148
/// <summary>

0 commit comments

Comments
 (0)