Skip to content

Commit a222c29

Browse files
Reorder sqlite_query params: query_type before query (match Node.js/.NET)
All SDKs now use (queryType, query, params) parameter order, consistent with the Node.js and .NET reference implementations. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 6ab9e8e commit a222c29

8 files changed

Lines changed: 11 additions & 11 deletions

File tree

go/internal/e2e/session_fs_sqlite_e2e_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func (p *inMemorySqliteProvider) Rename(src string, dest string) error {
195195
return nil
196196
}
197197

198-
func (p *inMemorySqliteProvider) SqliteQuery(query string, queryType rpc.SessionFsSqliteQueryType, params map[string]any) (*copilot.SessionFsSqliteQueryResult, error) {
198+
func (p *inMemorySqliteProvider) SqliteQuery(queryType rpc.SessionFsSqliteQueryType, query string, params map[string]any) (*copilot.SessionFsSqliteQueryResult, error) {
199199
p.mu.Lock()
200200
defer p.mu.Unlock()
201201
p.hadQuery = true

go/session_fs_provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ type SessionFsProvider interface {
5757
// so these methods do not take a session ID parameter.
5858
type SessionFsSqliteProvider interface {
5959
// SqliteQuery executes a SQLite query against the provider's per-session database.
60-
SqliteQuery(query string, queryType rpc.SessionFsSqliteQueryType, params map[string]any) (*SessionFsSqliteQueryResult, error)
60+
SqliteQuery(queryType rpc.SessionFsSqliteQueryType, query string, params map[string]any) (*SessionFsSqliteQueryResult, error)
6161
// SqliteExists checks whether the provider has a SQLite database for the session.
6262
SqliteExists() (bool, error)
6363
}
@@ -201,7 +201,7 @@ func (a *sessionFsAdapter) SqliteQuery(request *rpc.SessionFsSqliteQueryRequest)
201201
Error: &rpc.SessionFsError{Code: rpc.SessionFsErrorCodeUNKNOWN, Message: &msg},
202202
}, nil
203203
}
204-
result, err := sp.SqliteQuery(request.Query, request.QueryType, request.Params)
204+
result, err := sp.SqliteQuery(request.QueryType, request.Query, request.Params)
205205
if err != nil {
206206
return &rpc.SessionFsSqliteQueryResult{
207207
Columns: []string{},

python/copilot/session_fs_provider.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ class MyProvider(SessionFsProvider, SessionFsSqliteProvider): ...
120120
@abc.abstractmethod
121121
async def sqlite_query(
122122
self,
123-
query: str,
124123
query_type: SessionFSSqliteQueryType,
124+
query: str,
125125
params: dict[str, float | str | None] | None = None,
126126
) -> SessionFsSqliteQueryResult:
127127
"""Execute a SQLite query against the provider's per-session database."""
@@ -273,8 +273,8 @@ async def sqlite_query(self, params: Any) -> _GeneratedSqliteQueryResult:
273273
),
274274
)
275275
result = await self._p.sqlite_query(
276-
params.query,
277276
params.query_type,
277+
params.query,
278278
getattr(params, "params", None),
279279
)
280280
return _GeneratedSqliteQueryResult(

python/e2e/test_session_fs_sqlite_e2e.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ async def rename(self, src: str, dest: str) -> None:
148148

149149
async def sqlite_query(
150150
self,
151-
query: str,
152151
query_type: SessionFSSqliteQueryType,
152+
query: str,
153153
params: dict[str, float | str | None] | None = None,
154154
) -> SessionFsSqliteQueryResult:
155155
self._sqlite_calls.append(

rust/src/session_fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,8 @@ pub trait SessionFsSqliteProvider: Send + Sync {
410410
/// Execute a SQLite query against the provider's per-session database.
411411
async fn sqlite_query(
412412
&self,
413-
query: &str,
414413
query_type: SessionFsSqliteQueryType,
414+
query: &str,
415415
params: Option<&HashMap<String, serde_json::Value>>,
416416
) -> Result<SessionFsSqliteQueryResult, FsError>;
417417

rust/src/session_fs_dispatch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@ pub(crate) async fn sqlite_query(
342342
let sqlite_params = (!params.params.is_empty()).then_some(&params.params);
343343
let result = match sqlite
344344
.sqlite_query(
345-
&params.query,
346345
params.query_type,
346+
&params.query,
347347
sqlite_params,
348348
)
349349
.await

rust/tests/e2e/session_fs_sqlite.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ impl SessionFsProvider for InMemorySqliteProvider {
211211
impl SessionFsSqliteProvider for InMemorySqliteProvider {
212212
async fn sqlite_query(
213213
&self,
214-
query: &str,
215214
query_type: SessionFsSqliteQueryType,
215+
query: &str,
216216
_params: Option<&HashMap<String, serde_json::Value>>,
217217
) -> Result<SessionFsSqliteQueryResult, FsError> {
218218
let qt_str = match query_type {

rust/tests/session_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2994,8 +2994,8 @@ impl SessionFsProvider for RecordingFsProvider {
29942994
impl SessionFsSqliteProvider for RecordingFsProvider {
29952995
async fn sqlite_query(
29962996
&self,
2997-
query: &str,
29982997
query_type: SessionFsSqliteQueryType,
2998+
query: &str,
29992999
params: Option<&std::collections::HashMap<String, serde_json::Value>>,
30003000
) -> Result<SessionFsSqliteQueryResult, FsError> {
30013001
let mut row = std::collections::HashMap::new();
@@ -3220,8 +3220,8 @@ async fn session_fs_maps_sqlite_errors_to_results() {
32203220
impl SessionFsSqliteProvider for AlwaysFails {
32213221
async fn sqlite_query(
32223222
&self,
3223-
_query: &str,
32243223
_query_type: SessionFsSqliteQueryType,
3224+
_query: &str,
32253225
_params: Option<&std::collections::HashMap<String, serde_json::Value>>,
32263226
) -> Result<SessionFsSqliteQueryResult, FsError> {
32273227
Err(FsError::Other("sqlite unavailable".to_string()))

0 commit comments

Comments
 (0)