Changeset 355

Timestamp:

08/25/10 21:00:18 (18 months ago)

Author:

antonbatenev.ya.ru

Message:

Промежуточный - подготовка драйвера для MySQL через ODBC

Location:

trunk

Files:

• form_settings_ui.cpp (modified) (2 diffs)
• storage/mysql_database.cpp (modified) (2 diffs)
• version.h (modified) (1 diff)

trunk/form_settings_ui.cpp

@@ -69 +69 @@
 
         m_label_rsdn_host = new QLabel(this);
-        m_label_rsdn_host->setText(QString::fromUtf8("RSDN хост"));
+        m_label_rsdn_host->setText(QString::fromUtf8("хост"));
         m_layout_label_network->addWidget(m_label_rsdn_host);
 
         m_label_rsdn_port = new QLabel(this);
-        m_label_rsdn_port->setText(QString::fromUtf8("RSDN порт"));
+        m_label_rsdn_port->setText(QString::fromUtf8("порт"));
         m_layout_label_network->addWidget(m_label_rsdn_port);
 
         m_label_rsdn_login = new QLabel(this);
-        m_label_rsdn_login->setText(QString::fromUtf8("RSDN логин"));
+        m_label_rsdn_login->setText(QString::fromUtf8("логин"));
         m_layout_label_network->addWidget(m_label_rsdn_login);
 
         m_label_rsdn_password = new QLabel(this);
-        m_label_rsdn_password->setText(QString::fromUtf8("RSDN пароль"));
+        m_label_rsdn_password->setText(QString::fromUtf8("пароль"));
         m_layout_label_network->addWidget(m_label_rsdn_password);
 
@@ -192 +192 @@
 
         m_label_database_type = new QLabel(this);
-        m_label_database_type->setText(QString::fromUtf8("тип хранилища"));
+        m_label_database_type->setText(QString::fromUtf8("тип"));
         m_layout_label_storage->addWidget(m_label_database_type);
 

trunk/storage/mysql_database.cpp

@@ -8 +8 @@
 //----------------------------------------------------------------------------------------------
 
-AMySQLDatabase::AMySQLDatabase () : ADatabase ("QMYSQL")
+AMySQLDatabase::AMySQLDatabase () : ADatabase
+(
+#ifdef Q_WS_WIN
+        "QODBC"
+#else
+        "QMYSQL"
+#endif
+)
 {
         m_transaction = false;
@@ -37 +44 @@
 
         QString database_host     = settings.value("mysql/host"    ).toString();
+        QString database_port     = settings.value("mysql/port"    ).toString();
         QString database_name     = settings.value("mysql/name"    ).toString();
         QString database_login    = settings.value("mysql/login"   ).toString();
         QString database_password = settings.value("mysql/password").toString();
 
-        ADatabase::setHostName(database_host);
-        ADatabase::setDatabaseName(database_name);
-        ADatabase::setUserName(database_login);
-        ADatabase::setPassword(database_password);
+        bool is_socket = false;
+        int database_port_i = database_port.toInt(&is_socket);
+
+        #ifdef Q_WS_WIN
+                // http://www.connectionstrings.com/mysql#p31
+                QString connection_string;
+
+                connection_string += "Driver={MySQL ODBC 5.1 Driver};";
+                connection_string += "Server=" + database_host + ";";
+                connection_string += "Port=" + database_port + ";";
+                connection_string += "Database=" + database_name + ";";
+                connection_string += "User=" + database_login + ";";
+                connection_string += "Password=" + database_password + ";";
+        #else
+                ADatabase::setHostName(database_host);
+                ADatabase::setPort(database_port);
+                ADatabase::setDatabaseName(database_name);
+                ADatabase::setUserName(database_login);
+                ADatabase::setPassword(database_password);
+        #endif
 
         m_transaction = false;

trunk/version.h

@@ -20 +20 @@
  * \brief Дата билда (заменяется автоматически при каждом билде в version.h, что и приводит к смене номера ревизии)
  */
-#define AVALON_DATE "Срд Авг 25 19:07:04 MSD 2010"
+#define AVALON_DATE "Срд Авг 25 19:19:26 MSD 2010"
 
 #endif