improve database uri quoting (eg. for table names with quotes)

jef · jef · commit 9e93c6e9ae18 · 2010-04-20T14:54:50.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13336 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -306,12 +306,12 @@ void QgsDataSourceURI::clearSchema()
   mSchema = "";
 }
 
-QString QgsDataSourceURI::escape( const QString &theVal ) const
+QString QgsDataSourceURI::escape( const QString &theVal, QChar delim = '\'' ) const
 {
   QString val = theVal;
 
   val.replace( "\\", "\\\\" );
-  val.replace( "\'", "\\'" );
+  val.replace( delim, QString( "\\%1" ).arg( delim ) );
 
   return val;
 }
@@ -349,7 +349,7 @@ QString QgsDataSourceURI::getValue( const QString &uri, int &i )
         i++;
         if ( i == uri.length() )
           continue;
-        if ( uri[i] != '\'' && uri[i] != '\\' )
+        if ( uri[i] != delim && uri[i] != '\\' )
           i--;
       }
       else if ( uri[i] == delim )
@@ -449,10 +449,13 @@ QString QgsDataSourceURI::uri() const
 
 QString QgsDataSourceURI::quotedTablename() const
 {
-  if ( mSchema != "" )
-    return QString( "\"%1\".\"%2\"" ).arg( mSchema ).arg( mTable );
+  if ( !mSchema.isEmpty() )
+    return QString( "\"%1\".\"%2\"" )
+           .arg( escape( mSchema, '"' ) )
+           .arg( escape( mTable, '"' ) );
   else
-    return QString( "\"%1\"" ).arg( mTable );
+    return QString( "\"%1\"" )
+           .arg( escape( mTable, '"' ) );
 }
 
 void QgsDataSourceURI::setConnection( const QString &host,
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
@@ -107,7 +107,7 @@ class CORE_EXPORT QgsDataSourceURI
   private:
     void skipBlanks( const QString &uri, int &i );
     QString getValue( const QString &uri, int &i );
-    QString escape( const QString &uri ) const;
+    QString escape( const QString &uri, QChar delim ) const;
 
     /* data */
 
@@ -123,7 +123,7 @@ class CORE_EXPORT QgsDataSourceURI
     QString mTable;
     //! geometry column
     QString mGeometryColumn;
-    //! SQL where clause used to limit features returned from the layer
+    //! SQL query or where clause used to limit features returned from the layer
     QString mSql;
     //! username
     QString mUsername;

Original file line number	Diff line number	Diff line change
`@@ -306,12 +306,12 @@ void QgsDataSourceURI::clearSchema()`
`306`	`306`	`mSchema = "";`
`307`	`307`	`}`
`308`	`308`
`309`		`-QString QgsDataSourceURI::escape( const QString &theVal ) const`
	`309`	`+QString QgsDataSourceURI::escape( const QString &theVal, QChar delim = '\'' ) const`
`310`	`310`	`{`
`311`	`311`	`QString val = theVal;`
`312`	`312`
`313`	`313`	`val.replace( "\\", "\\\\" );`
`314`		`- val.replace( "\'", "\\'" );`
	`314`	`+ val.replace( delim, QString( "\\%1" ).arg( delim ) );`
`315`	`315`
`316`	`316`	`return val;`
`317`	`317`	`}`
`@@ -349,7 +349,7 @@ QString QgsDataSourceURI::getValue( const QString &uri, int &i )`
`349`	`349`	`i++;`
`350`	`350`	`if ( i == uri.length() )`
`351`	`351`	`continue;`
`352`		`- if ( uri[i] != '\'' && uri[i] != '\\' )`
	`352`	`+ if ( uri[i] != delim && uri[i] != '\\' )`
`353`	`353`	`i--;`
`354`	`354`	`}`
`355`	`355`	`else if ( uri[i] == delim )`
`@@ -449,10 +449,13 @@ QString QgsDataSourceURI::uri() const`
`449`	`449`
`450`	`450`	`QString QgsDataSourceURI::quotedTablename() const`
`451`	`451`	`{`
`452`		`- if ( mSchema != "" )`
`453`		`- return QString( "\"%1\".\"%2\"" ).arg( mSchema ).arg( mTable );`
	`452`	`+ if ( !mSchema.isEmpty() )`
	`453`	`+ return QString( "\"%1\".\"%2\"" )`
	`454`	`+ .arg( escape( mSchema, '"' ) )`
	`455`	`+ .arg( escape( mTable, '"' ) );`
`454`	`456`	`else`
`455`		`- return QString( "\"%1\"" ).arg( mTable );`
	`457`	`+ return QString( "\"%1\"" )`
	`458`	`+ .arg( escape( mTable, '"' ) );`
`456`	`459`	`}`
`457`	`460`
`458`	`461`	`void QgsDataSourceURI::setConnection( const QString &host,`