[meta]改进AbstractDevotedDBMetaResolver数据库兼容问题，DBCP升级至2.7.0

datagear-connection/pom.xml

@@ -19,8 +19,8 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>commons-dbcp</groupId>
-			<artifactId>commons-dbcp</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-dbcp2</artifactId>
 			<version>${DBCP.version}</version>
 		</dependency>
 	</dependencies>

datagear-connection/src/main/java/org/datagear/connection/DefaultConnectionSource.java

@@ -21,9 +21,9 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.DriverConnectionFactory;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.DriverConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -640,29 +640,33 @@ protected static class DriverBasicDataSource extends BasicDataSource
 	{
 		private Driver driver;
 
+		private Properties connectionProperties;
+
 		public DriverBasicDataSource(Driver driver, String url, Properties properties)
 		{
 			super();
 			this.driver = driver;
 			super.setDriverClassName(driver.getClass().getName());
 			super.setUrl(url);
-			super.connectionProperties = properties;
+			this.connectionProperties = properties;
 		}
 
-		protected Driver getDriver()
+		@Override
+		public Driver getDriver()
 		{
 			return driver;
 		}
 
-		protected void setDriver(Driver driver)
+		@Override
+		public void setDriver(Driver driver)
 		{
 			this.driver = driver;
 		}
 
 		@Override
 		protected ConnectionFactory createConnectionFactory() throws SQLException
 		{
-			return new DriverConnectionFactory(driver, url, connectionProperties);
+			return new DriverConnectionFactory(driver, getUrl(), this.connectionProperties);
 		}
 	}
 }

datagear-meta/src/main/java/org/datagear/meta/Table.java

@@ -144,29 +144,30 @@ public Column[] getColumns(String... names)
 		return columns;
 	}
 
+	@Override
+	public String toString()
+	{
+		return getClass().getSimpleName() + " [name=" + getName() + ", type=" + getType() + ", comment=" + getComment()
+				+ ", columns=" + Arrays.toString(columns) + ", primaryKey=" + primaryKey + ", uniqueKeys="
+				+ Arrays.toString(uniqueKeys) + ", importKeys=" + Arrays.toString(importKeys) + "]";
+	}
+
 	/**
 	 * 获取所有二进制列。
 	 * 
 	 * @return 返回空数组表示没有。
 	 */
-	public Column[] getBinaryColumns()
+	public static Column[] getBinaryColumns(Table table)
 	{
 		List<Column> bcs = new ArrayList<>(1);
 
-		for (Column column : this.columns)
+		Column[] columns = table.getColumns();
+		for (Column column : columns)
 		{
 			if (JdbcUtil.isBinaryType(column.getType()))
 				bcs.add(column);
 		}
 
 		return bcs.toArray(new Column[bcs.size()]);
 	}
-
-	@Override
-	public String toString()
-	{
-		return getClass().getSimpleName() + " [name=" + getName() + ", type=" + getType() + ", comment=" + getComment()
-				+ ", columns=" + Arrays.toString(columns) + ", primaryKey=" + primaryKey + ", uniqueKeys="
-				+ Arrays.toString(uniqueKeys) + ", importKeys=" + Arrays.toString(importKeys) + "]";
-	}
 }