From f790f715b78597727d0a6e6fd0f1723d29276adf Mon Sep 17 00:00:00 2001 From: Loredana Liccardo Date: Thu, 31 Jul 2014 09:02:47 +0000 Subject: [PATCH] bug fixed in Sampler and DatabaseOPerations classes to manage tables case sensitive for database Postgres git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManager@99145 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gcube/dataaccess/databases/sampler/Sampler.java | 13 ++++++++----- .../databases/utils/DatabaseManagement.java | 6 +++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java b/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java index 07386af..35e642d 100644 --- a/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java +++ b/src/main/java/org/gcube/dataaccess/databases/sampler/Sampler.java @@ -97,7 +97,7 @@ public class Sampler { if (DBType.equals(POSTGRES)) { //the full name equal to "schemaname.tablename" - tableName=schemaName+"."+tableName; + tableName=schemaName+"."+"\""+tableName+"\""; querySampleOnTable = String.format(queryForSampleOnTablePostgres, listAttributes, tableName); @@ -510,7 +510,8 @@ public class Sampler { if (DBType.equals(POSTGRES)) { //the full name equal to "schemaname.tablename" - tablename=schemaName+"."+tablename; + tablename=schemaName+"."+ "\""+tablename+"\""; + query = String.format(queryForSmartSampleOnTablePostgres, listAttributes, tablename); @@ -903,7 +904,8 @@ public class Sampler { if (DBType.equals(POSTGRES)) { //the full name equal to "schemaname.tablename" - tablename=schemaName+"."+tablename; + tablename=schemaName+"."+ "\""+tablename+"\""; + query = String.format( queryForSmartSampleWithThresholdOnTablePostgres, @@ -1224,7 +1226,7 @@ public class Sampler { if ((NumRows <= 700000) && (DBType.equals(POSTGRES))) { // Postgres //the full name equal to "schemaname.tablename" - tableName=schemaName+"."+tableName; + tableName=schemaName+"."+ "\""+tableName+"\""; querySampleOnTable = String.format( queryForRandomSampleOnTablePostgres, listAttributes, @@ -1235,7 +1237,8 @@ public class Sampler { if ((NumRows > 700000) && (DBType.equals(POSTGRES))) { // Postgres //the full name equal to "schemaname.tablename" - tableName=schemaName+"."+tableName; + tableName=schemaName+"."+ "\""+tableName+"\""; + // generate an index randomly to execute the query diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java index 16ef154..4ca07a2 100644 --- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java @@ -960,9 +960,9 @@ public class DatabaseManagement { // RowString); // check value row - // AnalysisLogger.getLogger().debug( - // "writing the value: " + RowString + " key: " - // + String.valueOf(i)); +// AnalysisLogger.getLogger().debug( +// "writing the value: " + RowString + " key: " +// + String.valueOf(i)); // mapResult.put(Integer.valueOf(i), RowString); mapResult.put(String.valueOf(i), RowString);