Changeset 256

Timestamp:

07/02/09 18:40:27 (3 years ago)

Author:

antonbatenev.ya.ru

Message:

Запрос настроек соединения (fix #40) при старте программы

Location:

trunk

Files:

• form_main.cpp (modified) (1 diff)
• storage/istorage.h (modified) (1 diff)
• storage/mysql_storage.cpp (modified) (1 diff)
• storage/mysql_storage.h (modified) (1 diff)
• storage/sqlite_storage.cpp (modified) (1 diff)
• storage/sqlite_storage.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/form_main.cpp

@@ -88 +88 @@
         m_forum_tree->setMainForm(this);
         m_message_tree->setMainForm(this);
+
+        // проверка корректности соединения
+        std::auto_ptr<IAStorage> storage(AStorageFactory::getStorage());
+
+        if (storage.get() != NULL)
+                if (storage->ping() == false)
+                        menu_service_settings_triggered();
 
         // загрузка дерева форумов

trunk/storage/istorage.h

@@ -42 +42 @@
 
                 /*!
+                 * \brief Проверка соединения с БД.
+                 */
+                virtual bool ping () = 0;
+
+                /*!
                  * \brief Получение информации о текущем пользователе.
                  * \param info Информация о пользователе, перед вызовом должно быть заполнено поле Name (логин на RSDN).

trunk/storage/mysql_storage.cpp

@@ -40 +40 @@
 
         return false;
+}
+//----------------------------------------------------------------------------------------------
+
+bool AMySQLStorage::ping ()
+{
+        QString sql = "SELECT 1 FROM `version`";
+
+        std::auto_ptr<AQuery> query_select(createQuery(sql));
+
+        if (query_select.get() == NULL)
+                return false;
+
+        return query_select->exec();
 }
 //----------------------------------------------------------------------------------------------

trunk/storage/mysql_storage.h

@@ -45 +45 @@
         private:
 
+                bool ping                   ();
                 bool whoAmI                 (AUserInfo& info, IProgress* progress = NULL);
                 bool getRowVersion          (ARowVersion& list,  IProgress* progress = NULL);

trunk/storage/sqlite_storage.cpp

@@ -40 +40 @@
 
         return false;
+}
+//----------------------------------------------------------------------------------------------
+
+bool ASQLiteStorage::ping ()
+{
+        QString sql = "SELECT 1 FROM `version`";
+
+        std::auto_ptr<AQuery> query_select(createQuery(sql));
+
+        if (query_select.get() == NULL)
+                return false;
+
+        return query_select->exec();
 }
 //----------------------------------------------------------------------------------------------

trunk/storage/sqlite_storage.h

@@ -45 +45 @@
         private:
 
+                bool ping                   ();
                 bool whoAmI                 (AUserInfo& info, IProgress* progress = NULL);
                 bool getRowVersion          (ARowVersion& list,  IProgress* progress = NULL);

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Срд Июл  1 17:02:50 MSD 2009"
+#define AVALON_DATE "Чтв Июл  2 18:38:02 MSD 2009"
 
 #endif