diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2022-01-30 12:52:59 +0100 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2022-02-04 19:22:01 +0100 |
| commit | 9df641d9c02c0f4fc42556a7adc23159095e133b (patch) | |
| tree | 9ffbd2e6ff8525d97b2b6e7cf90008866dc66fd9 | |
| parent | d6edfe382a6aad6887b2219d1c6f2d15571472fb (diff) | |
| download | tracker-9df641d9c02c0f4fc42556a7adc23159095e133b.tar.gz | |
libtracker-data: Forward number of columns to cursor
This way, we can allow the amount of columns as seen by the user
differ from the real number of columns. These extra columns might
bring additional per-row data, like correct column value types
that do not depend on static information or lacking (from our
perspective) SQLite type information.
| -rw-r--r-- | src/libtracker-data/tracker-db-interface-sqlite.c | 3 | ||||
| -rw-r--r-- | src/libtracker-data/tracker-db-interface.h | 1 | ||||
| -rw-r--r-- | src/libtracker-data/tracker-sparql.c | 9 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c index 499d5c96d..bb1357603 100644 --- a/src/libtracker-data/tracker-db-interface-sqlite.c +++ b/src/libtracker-data/tracker-db-interface-sqlite.c @@ -3700,6 +3700,7 @@ tracker_db_statement_start_cursor (TrackerDBStatement *stmt, TrackerDBCursor * tracker_db_statement_start_sparql_cursor (TrackerDBStatement *stmt, + guint n_columns, TrackerPropertyType *types, guint n_types, GError **error) @@ -3707,7 +3708,7 @@ tracker_db_statement_start_sparql_cursor (TrackerDBStatement *stmt, g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL); g_return_val_if_fail (!stmt->stmt_is_used, NULL); - return tracker_db_cursor_sqlite_new (stmt, 0, types, n_types); + return tracker_db_cursor_sqlite_new (stmt, n_columns, types, n_types); } static void diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h index 83e0e9438..67b76704d 100644 --- a/src/libtracker-data/tracker-db-interface.h +++ b/src/libtracker-data/tracker-db-interface.h @@ -143,6 +143,7 @@ void tracker_db_statement_execute (TrackerDBS TrackerDBCursor * tracker_db_statement_start_cursor (TrackerDBStatement *stmt, GError **error); TrackerDBCursor * tracker_db_statement_start_sparql_cursor (TrackerDBStatement *stmt, + guint n_columns, TrackerPropertyType *types, guint n_types, GError **error); diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c index e8a6e7c25..364d32f0e 100644 --- a/src/libtracker-data/tracker-sparql.c +++ b/src/libtracker-data/tracker-sparql.c @@ -4647,7 +4647,7 @@ get_solution_for_pattern (TrackerSparql *sparql, iface = tracker_data_manager_get_writable_db_interface (sparql->data_manager); stmt = prepare_query (sparql, iface, - TRACKER_SELECT_CONTEXT (sparql->context)->literal_bindings, + TRACKER_SELECT_CONTEXT (sparql->context)->literal_bindings, NULL, TRUE, error); g_clear_object (&sparql->context); @@ -4655,7 +4655,7 @@ get_solution_for_pattern (TrackerSparql *sparql, if (!stmt) return NULL; - cursor = tracker_db_statement_start_sparql_cursor (stmt, + cursor = tracker_db_statement_start_sparql_cursor (stmt, 0, NULL, 0, error); g_object_unref (stmt); @@ -9952,6 +9952,7 @@ tracker_sparql_execute_cursor (TrackerSparql *sparql, TrackerDBStatement *stmt; TrackerDBInterface *iface = NULL; TrackerDBCursor *cursor = NULL; + TrackerSelectContext *select_context; TrackerPropertyType *types; guint n_types; @@ -9993,8 +9994,9 @@ tracker_sparql_execute_cursor (TrackerSparql *sparql, if (!iface) goto error; + select_context = TRACKER_SELECT_CONTEXT (sparql->context); stmt = prepare_query (sparql, iface, - TRACKER_SELECT_CONTEXT (sparql->context)->literal_bindings, + select_context->literal_bindings, parameters, sparql->cacheable, error); @@ -10005,6 +10007,7 @@ tracker_sparql_execute_cursor (TrackerSparql *sparql, n_types = sparql->var_types->len; cursor = tracker_db_statement_start_sparql_cursor (stmt, + select_context->n_columns, types, n_types, error); g_object_unref (stmt); |