You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/06/25 01:49:16 UTC
git commit: updating database scripts in credential store
Repository: airavata
Updated Branches:
refs/heads/master a1bb76352 -> 9526ceb2b
updating database scripts in credential store
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9526ceb2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9526ceb2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9526ceb2
Branch: refs/heads/master
Commit: 9526ceb2bb7869a75667b3b8ceeb8a2509836bc7
Parents: a1bb763
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Tue Jun 24 19:49:01 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Tue Jun 24 19:49:01 2014 -0400
----------------------------------------------------------------------
.../store/store/impl/db/CommunityUserDAO.java | 14 +++++++-------
.../store/store/impl/db/CredentialsDAO.java | 12 ++++++------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9526ceb2/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAO.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAO.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAO.java
index 9d3de23..f55cd55 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAO.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CommunityUserDAO.java
@@ -44,7 +44,7 @@ public class CommunityUserDAO extends ParentDAO {
public void addCommunityUser(CommunityUser user, String token, Connection connection)
throws CredentialStoreException {
- String sql = "insert into community_user values (?, ?, ?, ?)";
+ String sql = "INSERT INTO COMMUNITY_USER VALUES (?, ?, ?, ?)";
PreparedStatement preparedStatement = null;
@@ -78,7 +78,7 @@ public class CommunityUserDAO extends ParentDAO {
public void deleteCommunityUser(CommunityUser user, Connection connection) throws CredentialStoreException {
- String sql = "delete from community_user where gateway_name=? and community_user_name=?";
+ String sql = "DELETE FROM COMMUNITY_USER WHERE GATEWAY_NAME=? AND COMMUNITY_USER_NAME=?";
PreparedStatement preparedStatement = null;
@@ -108,7 +108,7 @@ public class CommunityUserDAO extends ParentDAO {
public void deleteCommunityUserByToken(CommunityUser user, String token, Connection connection)
throws CredentialStoreException {
- String sql = "delete from community_user where gateway_name=? and community_user_name=? and token_id=?";
+ String sql = "DELETE FROM COMMUNITY_USER WHERE GATEWAY_NAME=? AND COMMUNITY_USER_NAME=? AND TOKEN_ID=?";
PreparedStatement preparedStatement = null;
@@ -144,7 +144,7 @@ public class CommunityUserDAO extends ParentDAO {
public CommunityUser getCommunityUser(String gatewayName, String communityUserName, Connection connection)
throws CredentialStoreException {
- String sql = "select * from community_user where gateway_name=? and community_user_name=?";
+ String sql = "SELECT * FROM COMMUNITY_USER WHERE GATEWAY_NAME=? AND COMMUNITY_USER_NAME=?";
PreparedStatement preparedStatement = null;
@@ -181,7 +181,7 @@ public class CommunityUserDAO extends ParentDAO {
public CommunityUser getCommunityUserByToken(String gatewayName, String tokenId, Connection connection)
throws CredentialStoreException {
- String sql = "select * from community_user where gateway_name=? and token_id=?";
+ String sql = "SELECT * FROM COMMUNITY_USER WHERE GATEWAY_NAME=? AND TOKEN_ID=?";
PreparedStatement preparedStatement = null;
@@ -194,7 +194,7 @@ public class CommunityUserDAO extends ParentDAO {
ResultSet resultSet = preparedStatement.executeQuery();
if (resultSet.next()) {
- String communityUserName = resultSet.getString("community_user_name");
+ String communityUserName = resultSet.getString("COMMUNITY_USER_NAME");
String email = resultSet.getString("COMMUNITY_USER_EMAIL"); // TODO fix typo
return new CommunityUser(gatewayName, communityUserName, email);
@@ -221,7 +221,7 @@ public class CommunityUserDAO extends ParentDAO {
List<CommunityUser> userList = new ArrayList<CommunityUser>();
- String sql = "select * from community_user where gateway_name=?";
+ String sql = "SELECT * FROM COMMUNITY_USER WHERE GATEWAY_NAME=?";
PreparedStatement preparedStatement = null;
http://git-wip-us.apache.org/repos/asf/airavata/blob/9526ceb2/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
----------------------------------------------------------------------
diff --git a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
index 3eaa9ed..6699e7e 100644
--- a/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
+++ b/modules/credential-store-service/credential-store/src/main/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAO.java
@@ -86,7 +86,7 @@ public class CredentialsDAO extends ParentDAO {
public void addCredentials(String gatewayId, Credential credential, Connection connection)
throws CredentialStoreException {
- String sql = "insert into credentials values (?, ?, ?, ?, ?)";
+ String sql = "INSERT INTO CREDENTIALS VALUES (?, ?, ?, ?, ?)";
PreparedStatement preparedStatement = null;
@@ -125,7 +125,7 @@ public class CredentialsDAO extends ParentDAO {
public void deleteCredentials(String gatewayName, String tokenId, Connection connection)
throws CredentialStoreException {
- String sql = "delete from credentials where GATEWAY_ID=? and TOKEN_ID=?";
+ String sql = "DELETE FROM CREDENTIALS WHERE GATEWAY_ID=? AND TOKEN_ID=?";
PreparedStatement preparedStatement = null;
@@ -160,7 +160,7 @@ public class CredentialsDAO extends ParentDAO {
public void updateCredentials(String gatewayId, Credential credential, Connection connection)
throws CredentialStoreException {
- String sql = "update CREDENTIALS set CREDENTIAL = ?, PORTAL_USER_ID = ?, TIME_PERSISTED = ? where GATEWAY_ID = ? and TOKEN_ID = ?";
+ String sql = "UPDATE CREDENTIALS set CREDENTIAL = ?, PORTAL_USER_ID = ?, TIME_PERSISTED = ? where GATEWAY_ID = ? and TOKEN_ID = ?";
PreparedStatement preparedStatement = null;
@@ -203,7 +203,7 @@ public class CredentialsDAO extends ParentDAO {
public Credential getCredential(String gatewayName, String tokenId, Connection connection)
throws CredentialStoreException {
- String sql = "select * from credentials where GATEWAY_ID=? and TOKEN_ID=?";
+ String sql = "SELECT * FROM CREDENTIALS WHERE GATEWAY_ID=? AND TOKEN_ID=?";
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;
@@ -256,7 +256,7 @@ public class CredentialsDAO extends ParentDAO {
List<Credential> credentialList = new ArrayList<Credential>();
- String sql = "select * from credentials where GATEWAY_ID=?";
+ String sql = "SELECT * FROM CREDENTIALS WHERE GATEWAY_ID=?";
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;
@@ -307,7 +307,7 @@ public class CredentialsDAO extends ParentDAO {
List<Credential> credentialList = new ArrayList<Credential>();
- String sql = "select * from credentials";
+ String sql = "SELECT * FROM CREDENTIALS";
PreparedStatement preparedStatement = null;
ResultSet resultSet = null;