Skip to content
Permalink
Browse files

fill username from current_user on the server side for Postgresql

  • Loading branch information
jgrocha authored and nirvn committed Oct 6, 2019
1 parent 7adc2f1 commit 872befb77e66ab4868e0357a28428cc1d2ff120e
Showing with 3 additions and 6 deletions.
  1. +3 −6 src/providers/postgres/qgspostgresprovider.cpp
@@ -4733,7 +4733,7 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &
",styleSLD xml"
",useAsDefault boolean"
",description text"
",owner varchar(63)"
",owner varchar(63) DEFAULT CURRENT_USER"
",ui xml"
",update_time timestamp DEFAULT CURRENT_TIMESTAMP"
")" ) );
@@ -4764,9 +4764,9 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &
// two values are both replaced in the final .arg call of the string construction.

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"
"f_table_catalog,f_table_schema,f_table_name,f_geometry_column,styleName,styleQML,styleSLD,useAsDefault,description%11"
") VALUES ("
"%1,%2,%3,%4,%5,XMLPARSE(DOCUMENT %16),XMLPARSE(DOCUMENT %17),%8,%9,%10%12"
"%1,%2,%3,%4,%5,XMLPARSE(DOCUMENT %16),XMLPARSE(DOCUMENT %17),%8,%9%12"
")" )
.arg( QgsPostgresConn::quotedValue( dsUri.database() ) )
.arg( QgsPostgresConn::quotedValue( dsUri.schema() ) )
@@ -4775,7 +4775,6 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &
.arg( QgsPostgresConn::quotedValue( styleName.isEmpty() ? dsUri.table() : styleName ) )
.arg( useAsDefault ? "true" : "false" )
.arg( QgsPostgresConn::quotedValue( styleDescription.isEmpty() ? QDateTime::currentDateTime().toString() : styleDescription ) )
.arg( QgsPostgresConn::quotedValue( dsUri.username() ) )
.arg( uiFileColumn )
.arg( uiFileValue )
// Must be the final .arg replacement - see above
@@ -4813,15 +4812,13 @@ bool QgsPostgresProviderMetadata::saveStyle( const QString &uri, const QString &
",styleQML=XMLPARSE(DOCUMENT %12)"
",styleSLD=XMLPARSE(DOCUMENT %13)"
",description=%4"
",owner=%5"
" WHERE f_table_catalog=%6"
" AND f_table_schema=%7"
" AND f_table_name=%8"
" AND f_geometry_column=%9"
" AND styleName=%10" )
.arg( useAsDefault ? "true" : "false" )
.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() ) )

0 comments on commit 872befb

Please sign in to comment.
You can’t perform that action at this time.