File tree Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Expand file tree Collapse file tree 4 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 11#[ rustfmt:: skip]
22/*
3- diesel master support on_conflict on rev_sqlite but not 1.4.7 version. Workaround for this
3+ diesel master support on_conflict on sqlite but not 1.4.7 version. Workaround for this
44
55match dsl::workspace_table
66 .filter(workspace_table::id.eq(table.id.clone()))
Original file line number Diff line number Diff line change @@ -197,7 +197,7 @@ impl DocumentManager {
197197 /// # Arguments
198198 ///
199199 /// * `doc_id`: the id of the document
200- /// * `pool`: rev_sqlite connection pool
200+ /// * `pool`: sqlite connection pool
201201 ///
202202 /// returns: Result<Arc<DocumentEditor>, FlowyError>
203203 ///
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ RUN git clone https://aur.archlinux.org/yay.git \
1717 && cd yay \
1818 && makepkg -sri --needed --noconfirm
1919
20- RUN yay -S --noconfirm curl base-devel rev_sqlite openssl clang cmake ninja pkg-config gtk3 unzip
20+ RUN yay -S --noconfirm curl base-devel sqlite openssl clang cmake ninja pkg-config gtk3 unzip
2121RUN xdg-user-dirs-update
2222RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
2323RUN source $HOME/.cargo/env && rustup toolchain install stable && rustup default stable
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ impl CrateProtoInfo {
1919 pub fn create_crate_mod_file ( & self ) {
2020 // mod model;
2121 // pub use model::*;
22- let mod_file_path = format ! ( "{}/rev_sqlite " , self . inner. protobuf_crate_name( ) ) ;
22+ let mod_file_path = format ! ( "{}/mod.rs " , self . inner. protobuf_crate_name( ) ) ;
2323 let mut content = "#![cfg_attr(rustfmt, rustfmt::skip)]\n " . to_owned ( ) ;
2424 content. push_str ( "// Auto-generated, do not edit\n " ) ;
2525 content. push_str ( "mod model;\n pub use model::*;" ) ;
@@ -84,7 +84,7 @@ impl ProtobufCrate {
8484 }
8585
8686 pub fn proto_model_mod_file ( & self ) -> String {
87- format ! ( "{}/rev_sqlite " , self . proto_struct_output_dir( ) )
87+ format ! ( "{}/mod.rs " , self . proto_struct_output_dir( ) )
8888 }
8989}
9090
You can’t perform that action at this time.
0 commit comments