From 4bb57230d70aa52cdb29032314c9e61656db0897 Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Wed, 23 Jul 2014 15:13:48 +0000 Subject: [PATCH] bugs fixed in showcreatetable and samplings operations. In these operation it is useful to insert the table name in a query as "schema.table" for postgres and "db.table" for mysql. Class GettableDetails modified to provide the schema or db name in input to the rows computation git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManagerAlgorithms@98908 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../drmalgorithms/GetTableDetails.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java index 2797c09..7ffa6a4 100644 --- a/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java +++ b/src/main/java/org/gcube/dataaccess/algorithms/drmalgorithms/GetTableDetails.java @@ -456,8 +456,27 @@ public class GetTableDetails extends StandardLocalExternalAlgorithm { // recover the number of rows // BigInteger rows = mgt.getNumberOfRows(tableName); + + long rows = 0; + + if ((driverInfo.toLowerCase().contains("postgres"))) { + AnalysisLogger.getLogger().debug( + "In GetTableDetails->*schemaName:" + schemaName);; - long rows = mgt.getNumberOfRows(tableName); + rows = mgt.getNumberOfRows(tableName, schemaName); + + } + + if ((driverInfo.toLowerCase().contains("mysql"))) { + + AnalysisLogger.getLogger().debug( + "In GetTableDetails->*databasename:" + databaseName);; + + rows = mgt.getNumberOfRows(tableName, databaseName); + + } + +// long rows = mgt.getNumberOfRows(tableName); // PrimitiveType valRows = new PrimitiveType( // String.class.getName(), rows.toString(),