quote closing parens within column names (fixes #7159)

qgis · Feb 15, 2013 · b630692 · b630692
1 parent c036e7e
commit b630692
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -102,14 +102,20 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )
           int start = i;
           QString col;
           while ( i < uri.length() && uri[i] != ')' )
+          {
+            if ( uri[i] == '\\' )
+              i++;
             i++;
+          }
 
           if ( i == uri.length() )
           {
             QgsDebugMsg( "closing parenthesis missing" );
           }
 
           mGeometryColumn = uri.mid( start, i - start );
+          mGeometryColumn.replace( "\\)", ")" );
+          mGeometryColumn.replace( "\\\\", "\\" );
 
           i++;
         }
@@ -584,9 +590,13 @@ QString QgsDataSourceURI::uri() const
     theUri += QString( " selectatid=false" );
   }
 
+  QString columnName( mGeometryColumn );
+  columnName.replace( "\\", "\\\\" );
+  columnName.replace( ")", "\\)" );
+
   theUri += QString( " table=%1%2 sql=%3" )
             .arg( quotedTablename() )
-            .arg( mGeometryColumn.isNull() ? QString() : QString( " (%1)" ).arg( mGeometryColumn ) )
+            .arg( mGeometryColumn.isNull() ? QString() : QString( " (%1)" ).arg( columnName ) )
             .arg( mSql );
 
   return theUri;