From 3498171c0e9eeef8f7ee190552228fd42de17be1 Mon Sep 17 00:00:00 2001 From: Spxg Date: Sat, 17 May 2025 22:45:01 +0800 Subject: [PATCH] Remove code to sql --- src/app/advanced_options_menu.rs | 10 +++++----- src/app/editor.rs | 2 +- src/app/header.rs | 4 ++-- src/app/playground.rs | 4 ++-- src/app/state.rs | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/advanced_options_menu.rs b/src/app/advanced_options_menu.rs index 528ec26..e83a20c 100644 --- a/src/app/advanced_options_menu.rs +++ b/src/app/advanced_options_menu.rs @@ -9,18 +9,18 @@ use crate::app::{ pub fn AdvancedOptionsMenu() -> impl IntoView { let state = expect_context::>(); - let value = move || *state.run_selected_code().read(); - let is_default = move || !*state.run_selected_code().read(); + let value = move || *state.run_selected_sql().read(); + let is_default = move || !*state.run_selected_sql().read(); let on_change = move |value: &bool| { - state.run_selected_code().set(*value); + state.run_selected_sql().set(*value); }; view! { <> impl IntoView { "ace/keyboard/{}", state.editor_config().read_untracked().keyboard )) - .value(&shared_code().unwrap_or_else(|| state.code().get_untracked())) + .value(&shared_code().unwrap_or_else(|| state.sql().get_untracked())) .build(); match aceditor::Editor::open("ace_editor", Some(&opt)) { diff --git a/src/app/header.rs b/src/app/header.rs index 66dd598..027c869 100644 --- a/src/app/header.rs +++ b/src/app/header.rs @@ -65,9 +65,9 @@ pub fn execute(state: Store) -> Box { return; }; - let run_selected_code = state.run_selected_code().get(); + let run_selected_code = state.run_selected_sql().get(); - state.code().set(code.clone()); + state.sql().set(code.clone()); change_focus(state, Some(Focus::Execute)); std::mem::take(&mut *state.output().write()); diff --git a/src/app/playground.rs b/src/app/playground.rs index 88a9b3d..0ebf8c9 100644 --- a/src/app/playground.rs +++ b/src/app/playground.rs @@ -57,8 +57,8 @@ fn hanlde_save_state(state: Store) { state.orientation().track(); state.theme().track(); state.keep_ctx().track(); - state.code().track(); - state.run_selected_code().track(); + state.sql().track(); + state.run_selected_sql().track(); state.read_untracked().save(); }); diff --git a/src/app/state.rs b/src/app/state.rs index 1efb798..de8fb5f 100644 --- a/src/app/state.rs +++ b/src/app/state.rs @@ -17,8 +17,8 @@ pub struct GlobalState { orientation: Orientation, theme: Theme, keep_ctx: bool, - code: String, - run_selected_code: bool, + sql: String, + run_selected_sql: bool, // runtime state below #[serde(skip)] worker: Option, @@ -44,7 +44,7 @@ impl Default for GlobalState { fn default() -> Self { Self { editor_config: EditorConfig::default(), - code: DEFAULT_CODE.into(), + sql: DEFAULT_CODE.into(), focus: None, show_something: false, orientation: Orientation::Automatic, @@ -58,7 +58,7 @@ impl Default for GlobalState { worker: None, editor: None, last_error: None, - run_selected_code: false, + run_selected_sql: false, } } }