Skip to content

[WIP] AMBARI-26314: Ambari's ldap-sync issue for db's #3948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

[WIP] AMBARI-26314: Ambari's ldap-sync issue for db's #3948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ambari-server/src/main/java/org/apache/ambari/server/orm/entities/GroupEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
import org.apache.ambari.server.security.authorization.GroupType;

@Entity
@Table(name = "\"groups\"", uniqueConstraints = {@UniqueConstraint(columnNames = {"group_name", "ldap_group"})})
@Table(name = "groups_info", uniqueConstraints = {@UniqueConstraint(columnNames = {"group_name", "ldap_group"})})
@TableGenerator(name = "group_id_generator",
table = "ambari_sequences",
pkColumnName = "sequence_name",
Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ CREATE TABLE user_authentication (
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id));

CREATE TABLE groups (
CREATE TABLE groups_info (
group_id INTEGER,
principal_id BIGINT NOT NULL,
group_name VARCHAR(255) NOT NULL,
Expand All @@ -353,7 +353,7 @@ CREATE TABLE members (
user_id INTEGER NOT NULL,
CONSTRAINT PK_members PRIMARY KEY (member_id),
UNIQUE(group_id, user_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id));

CREATE TABLE requestschedule (
Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ CREATE TABLE user_authentication (
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id)
);

CREATE TABLE `groups` (
CREATE TABLE groups_info (
group_id INTEGER,
principal_id BIGINT NOT NULL,
group_name VARCHAR(255) NOT NULL,
Expand All @@ -372,7 +372,7 @@ CREATE TABLE members (
group_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
CONSTRAINT PK_members PRIMARY KEY (member_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES `groups` (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id),
CONSTRAINT UNQ_members_0 UNIQUE (group_id, user_id));

Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ CREATE TABLE user_authentication (
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id)
);

CREATE TABLE groups (
CREATE TABLE groups_info (
group_id NUMBER(10) NOT NULL,
principal_id NUMBER(19) NOT NULL,
group_name VARCHAR2(255) NOT NULL,
Expand All @@ -353,7 +353,7 @@ CREATE TABLE members (
group_id NUMBER(10) NOT NULL,
user_id NUMBER(10) NOT NULL,
CONSTRAINT PK_members PRIMARY KEY (member_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id),
CONSTRAINT UNQ_members_0 UNIQUE (group_id, user_id));

Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ CREATE TABLE user_authentication (
CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id),
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id));

CREATE TABLE groups (
CREATE TABLE groups_info (
group_id INTEGER,
principal_id BIGINT NOT NULL,
group_name VARCHAR(255) NOT NULL,
Expand All @@ -355,7 +355,7 @@ CREATE TABLE members (
user_id INTEGER NOT NULL,
CONSTRAINT PK_members PRIMARY KEY (member_id),
UNIQUE(group_id, user_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id));

CREATE TABLE requestschedule (
Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ CREATE TABLE user_authentication (
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id)
);

CREATE TABLE groups (
CREATE TABLE groups_info (
group_id INTEGER,
principal_id NUMERIC(19) NOT NULL,
group_name VARCHAR(255) NOT NULL,
Expand All @@ -351,7 +351,7 @@ CREATE TABLE members (
group_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
CONSTRAINT PK_members PRIMARY KEY (member_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id),
CONSTRAINT UNQ_members_0 UNIQUE (group_id, user_id));

Expand Down
4 changes: 2 additions & 2 deletions ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ CREATE TABLE user_authentication (
CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id)
);

CREATE TABLE groups (
CREATE TABLE groups_info (
group_id INTEGER,
principal_id BIGINT NOT NULL,
group_name VARCHAR(255) NOT NULL,
Expand All @@ -357,7 +357,7 @@ CREATE TABLE members (
group_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
CONSTRAINT PK_members PRIMARY KEY CLUSTERED (member_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups (group_id),
CONSTRAINT FK_members_group_id FOREIGN KEY (group_id) REFERENCES groups_info (group_id),
CONSTRAINT FK_members_user_id FOREIGN KEY (user_id) REFERENCES users (user_id),
CONSTRAINT UNQ_members_0 UNIQUE (group_id, user_id));

Expand Down