You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/05/21 13:32:40 UTC
[ambari] branch trunk updated: [AMBARI-23869] Inconsistent
datatypes error when authenticating users when Oracle is the backend
database for Ambari
This is an automated email from the ASF dual-hosted git repository.
rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 69b0399 [AMBARI-23869] Inconsistent datatypes error when authenticating users when Oracle is the backend database for Ambari
69b0399 is described below
commit 69b039932b091e5742e2a2f3ae84ad1491c6fbc5
Author: Robert Levas <rl...@hortonworks.com>
AuthorDate: Sun May 20 14:19:00 2018 -0400
[AMBARI-23869] Inconsistent datatypes error when authenticating users when Oracle is the backend database for Ambari
---
.../main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java | 3 +--
ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 4 ++--
ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 2 +-
ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql | 2 +-
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java | 3 +--
8 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index 27212a3..5df03bb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.sql.Clob;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -568,7 +567,7 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_USER_AUTHENTICATION_ID_COLUMN, Long.class, null, null, false));
columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_USER_ID_COLUMN, Integer.class, null, null, false));
columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_TYPE_COLUMN, String.class, 50, null, false));
- columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_KEY_COLUMN, Clob.class, null, null, true));
+ columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_KEY_COLUMN, String.class, 2048, null, true));
columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_CREATE_TIME_COLUMN, Timestamp.class, null, null, true));
columns.add(new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_UPDATE_TIME_COLUMN, Timestamp.class, null, null, true));
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index c06bc95..2c5bc3b 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -311,7 +311,7 @@ CREATE TABLE user_authentication (
user_authentication_id INTEGER,
user_id INTEGER NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key CLOB,
+ authentication_key VARCHAR(2048),
create_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
index 87ef6be..681545a 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
@@ -331,9 +331,9 @@ CREATE TABLE user_authentication (
user_authentication_id INTEGER,
user_id INTEGER NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key TEXT,
+ authentication_key VARCHAR(2048),
create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- update_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ update_time TIMESTAMP DEFAULT 0,
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id)
);
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
index b530cb6..80e7aac 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
@@ -311,7 +311,7 @@ CREATE TABLE user_authentication (
user_authentication_id NUMBER(10),
user_id NUMBER(10) NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key CLOB,
+ authentication_key VARCHAR(2048),
create_time TIMESTAMP NULL,
update_time TIMESTAMP NULL,
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index d6170a1..42387a3 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -313,7 +313,7 @@ CREATE TABLE user_authentication (
user_authentication_id INTEGER,
user_id INTEGER NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key TEXT,
+ authentication_key VARCHAR(2048),
create_time TIMESTAMP DEFAULT NOW(),
update_time TIMESTAMP DEFAULT NOW(),
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
index c257ec5..fd5f50a 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
@@ -309,7 +309,7 @@ CREATE TABLE user_authentication (
user_authentication_id INTEGER,
user_id INTEGER NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key TEXT,
+ authentication_key VARCHAR(2048),
create_time TIMESTAMP DEFAULT NOW(),
update_time TIMESTAMP DEFAULT NOW(),
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
diff --git a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
index e61ffa8..2b4a504 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
@@ -315,7 +315,7 @@ CREATE TABLE user_authentication (
user_authentication_id INTEGER,
user_id INTEGER NOT NULL,
authentication_type VARCHAR(50) NOT NULL,
- authentication_key TEXT,
+ authentication_key VARCHAR(2048),
create_time DATETIME DEFAULT GETDATE(),
update_time DATETIME DEFAULT GETDATE(),
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java
index 4ea9c45..c502403 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog270Test.java
@@ -140,7 +140,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
-import java.sql.Clob;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
@@ -643,7 +642,7 @@ public class UpgradeCatalog270Test {
new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_USER_AUTHENTICATION_ID_COLUMN, Long.class, null, null, false),
new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_USER_ID_COLUMN, Integer.class, null, null, false),
new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_TYPE_COLUMN, String.class, 50, null, false),
- new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_KEY_COLUMN, Clob.class, null, null, true),
+ new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_AUTHENTICATION_KEY_COLUMN, String.class, 2048, null, true),
new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_CREATE_TIME_COLUMN, Timestamp.class, null, null, true),
new DBAccessor.DBColumnInfo(USER_AUTHENTICATION_UPDATE_TIME_COLUMN, Timestamp.class, null, null, true)
)
--
To stop receiving notification emails like this one, please contact
rlevas@apache.org.