소스 검색

SQLStudio: Remove (unimplemented) ability to open database storage files

It may be handy to have some sort of storage inspector at some point but
for now, it doesn't make sense to open a database file. So only allow
opening script files, and don't make assumptions on their extension.
Timothy Flynn 2 년 전
부모
커밋
e3d5b67eaf
3개의 변경된 파일4개의 추가작업 그리고 19개의 파일을 삭제
  1. 1 9
      Userland/DevTools/SQLStudio/MainWidget.cpp
  2. 0 1
      Userland/DevTools/SQLStudio/MainWidget.h
  3. 3 9
      Userland/DevTools/SQLStudio/main.cpp

+ 1 - 9
Userland/DevTools/SQLStudio/MainWidget.cpp

@@ -352,11 +352,6 @@ void MainWidget::open_script_from_file(LexicalPath const& file_path)
     m_tab_widget->set_active_widget(&editor);
 }
 
-void MainWidget::open_database_from_file(LexicalPath const&)
-{
-    TODO();
-}
-
 bool MainWidget::request_close()
 {
     auto any_scripts_modified { false };
@@ -485,10 +480,7 @@ void MainWidget::drop_event(GUI::DropEvent& drop_event)
                 continue;
 
             auto lexical_path = LexicalPath(url.path());
-            if (lexical_path.extension().equals_ignoring_case("sql"sv))
-                open_script_from_file(lexical_path);
-            if (lexical_path.extension().equals_ignoring_case("db"sv))
-                open_database_from_file(lexical_path);
+            open_script_from_file(lexical_path);
         }
     }
 }

+ 0 - 1
Userland/DevTools/SQLStudio/MainWidget.h

@@ -25,7 +25,6 @@ public:
     void initialize_menu(GUI::Window*);
     void open_new_script();
     void open_script_from_file(LexicalPath const&);
-    void open_database_from_file(LexicalPath const&);
 
     bool request_close();
 

+ 3 - 9
Userland/DevTools/SQLStudio/main.cpp

@@ -39,18 +39,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         return GUI::Window::CloseRequestDecision::StayOpen;
     };
 
-    auto needs_new_script = true;
     if (file_to_open) {
         auto path = LexicalPath(file_to_open);
-        if (path.extension().equals_ignoring_case("sql"sv)) {
-            main_widget->open_script_from_file(path);
-            needs_new_script = false;
-        } else if (path.extension().equals_ignoring_case("db"sv)) {
-            main_widget->open_database_from_file(path);
-        }
-    }
-    if (needs_new_script)
+        main_widget->open_script_from_file(path);
+    } else {
         main_widget->open_new_script();
+    }
 
     window->show();
     return app->exec();