File tree Expand file tree Collapse file tree 4 files changed +16
-25
lines changed Expand file tree Collapse file tree 4 files changed +16
-25
lines changed Original file line number Diff line number Diff line change @@ -101,22 +101,15 @@ fn update_create_record(
101101 . map_err ( |_e| "failed binding to update_create_record_stmt" ) ?;
102102
103103 let res = update_create_record_stmt. step ( ) ;
104- match res {
104+ let result = match res {
105105 Ok ( ResultCode :: ROW ) => {
106106 let col_version = update_create_record_stmt. column_int64 ( 0 ) ;
107- super :: reset_cached_stmt ( update_create_record_stmt. stmt )
108- . map_err ( |_e| "failed to reset cached stmt" ) ?;
109107 Ok ( Some ( col_version) )
110108 }
111- Ok ( ResultCode :: DONE ) => {
112- super :: reset_cached_stmt ( update_create_record_stmt. stmt )
113- . map_err ( |_e| "failed to reset cached stmt" ) ?;
114- Ok ( None )
115- }
116- _ => {
117- super :: reset_cached_stmt ( update_create_record_stmt. stmt )
118- . map_err ( |_e| "failed to reset cached stmt" ) ?;
119- Err ( "failed to step update_create_record_stmt" . to_string ( ) )
120- }
121- }
109+ Ok ( ResultCode :: DONE ) => Ok ( None ) ,
110+ _ => Err ( "failed to step update_create_record_stmt" . to_string ( ) ) ,
111+ } ;
112+ super :: reset_cached_stmt ( update_create_record_stmt. stmt )
113+ . map_err ( |_e| "failed to reset cached stmt" ) ?;
114+ result
122115}
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ fn after_update(
8585 if crate :: compare_values:: any_value_changed ( pks_new, pks_old) ? {
8686 let old_key = tbl_info
8787 . get_or_create_key_via_raw_values ( db, pks_old)
88- . map_err ( |_| "failed geteting or creating lookaside key" ) ?;
88+ . map_err ( |_| "failed getting or creating lookaside key" ) ?;
8989 let next_seq = super :: bump_seq ( ext_data) ;
9090 changed = true ;
9191 // Record the delete of the row identified by the old primary keys
Original file line number Diff line number Diff line change @@ -98,20 +98,17 @@ fn mark_new_pk_row_created(
9898 . and_then ( |_| mark_locally_created_stmt. bind_int ( 3 , seq) )
9999 . and_then ( |_| mark_locally_created_stmt. bind_text ( 4 , ts, sqlite:: Destructor :: STATIC ) )
100100 . map_err ( |_| "failed binding to mark_locally_created_stmt" ) ?;
101- let res = mark_locally_created_stmt. step ( ) ;
102- match res {
101+ let stmt_res = mark_locally_created_stmt. step ( ) ;
102+ let result = match stmt_res {
103103 Ok ( ResultCode :: ROW ) => {
104104 let cl = mark_locally_created_stmt. column_int64 ( 0 ) ;
105- reset_cached_stmt ( mark_locally_created_stmt. stmt )
106- . map_err ( |_e| "failed to reset cached stmt" ) ?;
107105 Ok ( cl)
108106 }
109- _ => {
110- reset_cached_stmt ( mark_locally_created_stmt. stmt )
111- . map_err ( |_e| "failed to reset cached stmt" ) ?;
112- Err ( "failed to step mark locally created stmt" . to_string ( ) )
113- }
114- }
107+ _ => Err ( "failed to step mark locally created stmt" . to_string ( ) ) ,
108+ } ;
109+ reset_cached_stmt ( mark_locally_created_stmt. stmt )
110+ . map_err ( |_e| "failed to reset cached stmt" ) ?;
111+ result
115112}
116113
117114fn bump_seq ( ext_data : * mut crsql_ExtData ) -> c_int {
Original file line number Diff line number Diff line change @@ -28,6 +28,7 @@ use sqlite_nostd::ResultCode;
2828use sqlite_nostd:: Stmt ;
2929use sqlite_nostd:: StrRef ;
3030
31+ // TODO: make this configurable with a crsql_config_set.
3132const MAX_CL_CACHE_SIZE : usize = 1500 ;
3233pub struct TableInfo {
3334 pub tbl_name : String ,
You can’t perform that action at this time.
0 commit comments