WIP: Don't quote identifiers in dialect 1 database

* Dialect 1 databases don't support quoted identifiers. The code would need large changes to properly support this, so this fixes at least the most glaring issue - "Browse data" with setting always quote identifiers did not work at all so far for a dialect 1 database. This changes Identifier::getQuoted() in a way that the database dialect is checked.
mariuz · Nov 5, 2012 · 115d809 · 115d809
1 parent d9f542a
commit 115d809
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/metadata/MetadataTemplateCmdHandler.cpp b/src/metadata/MetadataTemplateCmdHandler.cpp
@@ -751,7 +751,7 @@ void MetadataTemplateCmdHandler::handleTemplateCmd(TemplateProcessor *tp,
         else if (cmdParams[0] == wxT("is_read_only"))
             processedText += getBooleanAsString(db->getInfo().getReadOnly());
         else if (cmdParams[0] == wxT("sql_dialect"))
-            processedText += wxString() << db->getInfo().getDialect();
+            processedText += wxString() << db->getSqlDialect();
         else if (cmdParams[0] == wxT("default_charset"))
             processedText += db->getDatabaseCharset();
         else if (cmdParams[0] == wxT("sweep_interval"))

diff --git a/src/metadata/database.cpp b/src/metadata/database.cpp
@@ -144,11 +144,6 @@ int DatabaseInfo::getBuffers() const
     return buffersM;
 }
 //-----------------------------------------------------------------------------
-int DatabaseInfo::getDialect() const
-{
-    return dialectM;
-}
-//-----------------------------------------------------------------------------
 bool DatabaseInfo::getForcedWrites() const
 {
     return forcedWritesM;
@@ -232,7 +227,6 @@ void DatabaseInfo::load(const IBPP::Database database)
         &buffersM, &sweepM, &forcedWritesM, &reserveM, &readOnlyM);
     database->TransactionInfo(&oldestTransactionM, &oldestActiveTransactionM,
         &oldestSnapshotM, &nextTransactionM);
-    dialectM = database->Dialect();
     loadTimeMillisM = ::wxGetLocalTimeMillis();
 }
 //-----------------------------------------------------------------------------
@@ -326,7 +320,7 @@ bool DatabaseAuthenticationMode::getUseEncryptedPassword() const
 // Database class
 Database::Database()
     : MetadataItem(ntDatabase), metadataLoaderM(0), connectedM(false),
-        connectionCredentialsM(0), charsetConverterM(0), idM(0)
+        connectionCredentialsM(0), charsetConverterM(0), dialectM(3), idM(0)
 {
 }
 //-----------------------------------------------------------------------------
@@ -1127,6 +1121,7 @@ void Database::connect(const wxString& password, ProgressIndicator* indicator)
                 checkProgressIndicatorCanceled(indicator);
                 // load database information
                 setPropertiesLoaded(false);
+                dialectM = databaseM->Dialect();
                 databaseInfoM.load(databaseM);
                 setPropertiesLoaded(true);
 
@@ -1461,6 +1456,11 @@ wxString Database::getPath() const
     return pathM;
 }
 //-----------------------------------------------------------------------------
+int Database::getSqlDialect() const
+{
+    return dialectM;
+}
+//-----------------------------------------------------------------------------
 wxString Database::getDatabaseCharset() const
 {
     return databaseCharsetM;

diff --git a/src/metadata/database.h b/src/metadata/database.h
@@ -83,7 +83,6 @@ class DatabaseInfo
 private:
     int odsM;
     int odsMinorM;
-    int dialectM;
 
     int pageSizeM;
     int buffersM;
@@ -109,8 +108,6 @@ class DatabaseInfo
     bool getODSVersionIsHigherOrEqualTo(int versionMajor) const;
     bool getODSVersionIsHigherOrEqualTo(int versionMajor, int versionMinor) const;
 
-    int getDialect() const;
-
     int getPageSize() const;
     int getBuffers() const;
     int getPages() const;
@@ -164,6 +161,7 @@ class Database: public MetadataItem,
     wxString connectionRoleM;
 
     wxString pathM;
+    int dialectM;
     Credentials credentialsM;
     Credentials* connectionCredentialsM;
     DatabaseAuthenticationMode authenticationModeM;
@@ -271,6 +269,7 @@ class Database: public MetadataItem,
     void getDatabaseTriggers(std::vector<Trigger *>& list);
 
     wxString getPath() const;
+    int getSqlDialect() const;
     wxString getDatabaseCharset() const;
     wxString getConnectionCharset() const;
     wxString getConnectionInfoString() const;

diff --git a/src/metadata/metadataitem.cpp b/src/metadata/metadataitem.cpp
@@ -631,6 +631,12 @@ wxString MetadataItem::getName_() const
 //-----------------------------------------------------------------------------
 wxString MetadataItem::getQuotedName() const
 {
+    if (DatabasePtr db = getDatabase())
+    {
+        // dialect 1 does not support quoted identifiers
+        if (db->getSqlDialect() == 1)
+            return identifierM.get();
+    }
     return identifierM.getQuoted();
 }
 //-----------------------------------------------------------------------------