Merge branch 'master' of github.com:qgis/QGIS

Author: rouault

CMakeLists.txt

@@ -612,7 +612,9 @@ ENDIF (ANDROID)
 IF(COMMAND cmake_policy)
   cmake_policy(SET CMP0003 NEW)
   cmake_policy(SET CMP0005 OLD)
-  cmake_policy(SET CMP0063 NEW)
+  IF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
+    cmake_policy(SET CMP0063 NEW)
+  ENDIF(NOT "${CMAKE_VERSION}" VERSION_LESS "3.3")
 ENDIF(COMMAND cmake_policy)
 
 IF (WIN32)

python/plugins/db_manager/db_plugins/oracle/plugin.py

@@ -527,7 +527,7 @@ def type2String(self):
 
     def update(self, new_name, new_type_str=None, new_not_null=None,
                new_default_str=None):
-        self.table().aboutToChange()
+        self.table().aboutToChange.emit()
         if self.name == new_name:
             new_name = None
         if self.type2String() == new_type_str:

python/plugins/db_manager/db_plugins/plugin.py

@@ -1091,7 +1091,7 @@ def rename(self, new_name):
         return self.update(new_name)
 
     def update(self, new_name, new_type_str=None, new_not_null=None, new_default_str=None):
-        self.table().aboutToChange()
+        self.table().aboutToChange.emit()
         if self.name == new_name:
             new_name = None
         if self.type2String() == new_type_str:

python/plugins/db_manager/db_plugins/postgis/plugin.py

@@ -184,7 +184,7 @@ def runVacuumAnalyze(self):
         self.schema().refresh() if self.schema() else self.database().refresh()
 
     def runRefreshMaterializedView(self):
-        self.aboutToChange()
+        self.aboutToChange.emit()
         self.database().connector.runRefreshMaterializedView((self.schemaName(), self.name))
         # TODO: change only this item, not re-create all the tables in the schema/database
         self.schema().refresh() if self.schema() else self.database().refresh()

src/app/qgsapplayertreeviewmenuprovider.cpp

@@ -148,7 +148,7 @@ QMenu* QgsAppLayerTreeViewMenuProvider::createContextMenu()
         if ( vlayer )
         {
           const QgsSingleSymbolRendererV2* singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2() );
-          if ( !singleRenderer && vlayer->rendererV2()->embeddedRenderer() )
+          if ( !singleRenderer && vlayer->rendererV2() && vlayer->rendererV2()->embeddedRenderer() )
           {
             singleRenderer = dynamic_cast< const QgsSingleSymbolRendererV2* >( vlayer->rendererV2()->embeddedRenderer() );
           }

src/providers/oracle/ocispatial/qsql_ocispatial.cpp

@@ -3163,9 +3163,7 @@ bool QOCISpatialResult::exec()
     qOraWarning( "Unable to get statement type:", d->err );
     setLastError( qMakeError( QCoreApplication::translate( "QOCISpatialResult",
                               "Unable to get statement type" ), QSqlError::StatementError, d->err ) );
-#ifdef QOCISPATIAL_DEBUG
-    qDebug() << "lastQuery()" << lastQuery();
-#endif
+    qWarning( "type retrieval failed with statement:%s", lastQuery().toLocal8Bit().constData() );
     return false;
   }
 
@@ -3189,9 +3187,7 @@ bool QOCISpatialResult::exec()
     qOraWarning( "unable to bind value: ", d->err );
     setLastError( qMakeError( QCoreApplication::translate( "QOCISpatialResult", "Unable to bind value" ),
                               QSqlError::StatementError, d->err ) );
-#ifdef QOCISPATIAL_DEBUG
-    qDebug() << "lastQuery()" << lastQuery();
-#endif
+    qWarning( "bind failed with statement:%s", lastQuery().toLocal8Bit().constData() );
     return false;
   }
 
@@ -3202,9 +3198,7 @@ bool QOCISpatialResult::exec()
     qOraWarning( "unable to execute statement:", d->err );
     setLastError( qMakeError( QCoreApplication::translate( "QOCISpatialResult",
                               "Unable to execute statement" ), QSqlError::StatementError, d->err ) );
-#ifdef QOCISPATIAL_DEBUG
-    qDebug() << "lastQuery()" << lastQuery();
-#endif
+    qWarning( "execution failed with statement:%s", lastQuery().toLocal8Bit().constData() );
     return false;
   }
 

src/providers/oracle/qgsoracleprovider.cpp

@@ -3402,19 +3402,25 @@ QGISEXTERN QString loadStyle( const QString &uri, QString &errCause )
   QSqlQuery qry( *conn );
 
   QString style;
-  if ( !qry.exec( QString( "SELECT styleQML FROM ("
-                           "SELECT styleQML"
-                           " FROM layer_styles"
-                           " WHERE f_table_catalog=%1"
-                           " AND f_table_schema=%2"
-                           " AND f_table_name=%3"
-                           " AND f_geometry_column=%4"
-                           " ORDER BY useAsDefault DESC"
-                           ") WHERE rownum=1" )
-                  .arg( QgsOracleConn::quotedValue( dsUri.database() ) )
-                  .arg( QgsOracleConn::quotedValue( dsUri.schema() ) )
-                  .arg( QgsOracleConn::quotedValue( dsUri.table() ) )
-                  .arg( QgsOracleConn::quotedValue( dsUri.geometryColumn() ) ) ) )
+  if ( !qry.exec( "SELECT COUNT(*) FROM user_tables WHERE table_name='LAYER_STYLES'" ) || !qry.next() || qry.value( 0 ).toInt() == 0 )
+  {
+    errCause = QObject::tr( "Unable layer style table not found [%1]" ).arg( qry.lastError().text() );
+    conn->disconnect();
+    return QString::null;
+  }
+  else if ( !qry.exec( QString( "SELECT styleQML FROM ("
+                                "SELECT styleQML"
+                                " FROM layer_styles"
+                                " WHERE f_table_catalog=%1"
+                                " AND f_table_schema=%2"
+                                " AND f_table_name=%3"
+                                " AND f_geometry_column=%4"
+                                " ORDER BY useAsDefault DESC"
+                                ") WHERE rownum=1" )
+                       .arg( QgsOracleConn::quotedValue( dsUri.database() ) )
+                       .arg( QgsOracleConn::quotedValue( dsUri.schema() ) )
+                       .arg( QgsOracleConn::quotedValue( dsUri.table() ) )
+                       .arg( QgsOracleConn::quotedValue( dsUri.geometryColumn() ) ) ) )
   {
     errCause = QObject::tr( "Could not retrieve style [%1]" ).arg( qry.lastError().text() );
   }