Fix saving styles in postgres where style definition includes %1 etc …

…strings
qgis · Oct 6, 2014 · 8b24554 · 8b24554
1 parent 11e3044
commit 8b24554
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3359,20 +3359,20 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
   QString sql = QString( "INSERT INTO layer_styles("
                          "f_table_catalog,f_table_schema,f_table_name,f_geometry_column,styleName,styleQML,styleSLD,useAsDefault,description,owner%11"
                          ") VALUES ("
-                         "%1,%2,%3,%4,%5,XMLPARSE(DOCUMENT %6),XMLPARSE(DOCUMENT %7),%8,%9,%10%12"
+                         "%1,%2,%3,%4,%5,XMLPARSE(DOCUMENT %16),XMLPARSE(DOCUMENT %17),%8,%9,%10%12"
                          ")" )
                 .arg( QgsPostgresConn::quotedValue( dsUri.database() ) )
                 .arg( QgsPostgresConn::quotedValue( dsUri.schema() ) )
                 .arg( QgsPostgresConn::quotedValue( dsUri.table() ) )
                 .arg( QgsPostgresConn::quotedValue( dsUri.geometryColumn() ) )
                 .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) )
-                .arg( QgsPostgresConn::quotedValue( qmlStyle ) )
-                .arg( QgsPostgresConn::quotedValue( sldStyle ) )
                 .arg( useAsDefault ? "true" : "false" )
                 .arg( QgsPostgresConn::quotedValue( styleDescription.isEmpty() ? QDateTime::currentDateTime().toString() : styleDescription ) )
                 .arg( QgsPostgresConn::quotedValue( dsUri.username() ) )
                 .arg( uiFileColumn )
-                .arg( uiFileValue );
+                .arg( uiFileValue )
+                .arg( QgsPostgresConn::quotedValue( qmlStyle ),
+                      QgsPostgresConn::quotedValue( sldStyle ) );
 
   QString checkQuery = QString( "SELECT styleName"
                                 " FROM layer_styles"
@@ -3402,8 +3402,8 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
 
     sql = QString( "UPDATE layer_styles"
                    " SET useAsDefault=%1"
-                   ",styleQML=XMLPARSE(DOCUMENT %2)"
-                   ",styleSLD=XMLPARSE(DOCUMENT %3)"
+                   ",styleQML=XMLPARSE(DOCUMENT %12)"
+                   ",styleSLD=XMLPARSE(DOCUMENT %13)"
                    ",description=%4"
                    ",owner=%5"
                    " WHERE f_table_catalog=%6"
@@ -3412,15 +3412,15 @@ QGISEXTERN bool saveStyle( const QString& uri, const QString& qmlStyle, const QS
                    " AND f_geometry_column=%9"
                    " AND styleName=%10" )
           .arg( useAsDefault ? "true" : "false" )
-          .arg( QgsPostgresConn::quotedValue( qmlStyle ) )
-          .arg( QgsPostgresConn::quotedValue( sldStyle ) )
           .arg( QgsPostgresConn::quotedValue( styleDescription.isEmpty() ? QDateTime::currentDateTime().toString() : styleDescription ) )
           .arg( QgsPostgresConn::quotedValue( dsUri.username() ) )
           .arg( QgsPostgresConn::quotedValue( dsUri.database() ) )
           .arg( QgsPostgresConn::quotedValue( dsUri.schema() ) )
           .arg( QgsPostgresConn::quotedValue( dsUri.table() ) )
           .arg( QgsPostgresConn::quotedValue( dsUri.geometryColumn() ) )
-          .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) );
+          .arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) )
+          .arg( QgsPostgresConn::quotedValue( qmlStyle ),
+                  QgsPostgresConn::quotedValue( sldStyle ) );
   }
 
   if ( useAsDefault )