oracle provider: don't acquire provider connection from pool

jef-n · jef-n · commit e7e8d58aa858 · 2016-02-15T23:21:08.000+01:00
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -70,7 +70,7 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )
   mRequestedGeomType = mUri.wkbType();
   mUseEstimatedMetadata = mUri.useEstimatedMetadata();
 
-  mConnection = QgsOracleConnPool::instance()->acquireConnection( mUri.connectionInfo() );
+  mConnection = QgsOracleConn::connectDb( mUri.connectionInfo() );
   if ( !mConnection )
   {
     return;
@@ -211,7 +211,7 @@ QgsAbstractFeatureSource *QgsOracleProvider::featureSource() const
 void QgsOracleProvider::disconnectDb()
 {
   if ( mConnection )
-    QgsOracleConnPool::instance()->releaseConnection( mConnection );
+    mConnection->disconnect();
   mConnection = 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ QgsOracleProvider::QgsOracleProvider( QString const & uri )`
`70`	`70`	`mRequestedGeomType = mUri.wkbType();`
`71`	`71`	`mUseEstimatedMetadata = mUri.useEstimatedMetadata();`
`72`	`72`
`73`		`- mConnection = QgsOracleConnPool::instance()->acquireConnection( mUri.connectionInfo() );`
	`73`	`+ mConnection = QgsOracleConn::connectDb( mUri.connectionInfo() );`
`74`	`74`	`if ( !mConnection )`
`75`	`75`	`{`
`76`	`76`	`return;`
`@@ -211,7 +211,7 @@ QgsAbstractFeatureSource *QgsOracleProvider::featureSource() const`
`211`	`211`	`void QgsOracleProvider::disconnectDb()`
`212`	`212`	`{`
`213`	`213`	`if ( mConnection )`
`214`		`- QgsOracleConnPool::instance()->releaseConnection( mConnection );`
	`214`	`+ mConnection->disconnect();`
`215`	`215`	`mConnection = 0;`
`216`	`216`	`}`
`217`	`217`