diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-02-07 17:58:11 +0100 |
|---|---|---|
| committer | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2017-02-10 09:48:36 +0100 |
| commit | caf7aba77fe1148e0514ab0fa24a5507d585ad37 (patch) | |
| tree | be72735ad8ddce5e0964e996a29dfcc48d5dde05 /sonar-db/src/main/resources | |
| parent | a60f3c39d100eb0eae125c01c6932ddfb37417c9 (diff) | |
| download | sonarqube-caf7aba77fe1148e0514ab0fa24a5507d585ad37.tar.gz sonarqube-caf7aba77fe1148e0514ab0fa24a5507d585ad37.zip | |
SONAR-8754 support guarded in OrganizationDto and OrganizationDao
Diffstat (limited to 'sonar-db/src/main/resources')
| -rw-r--r-- | sonar-db/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml | 3 | ||||
| -rw-r--r-- | sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sonar-db/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml b/sonar-db/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml index 5b5a44ce526..fa7e3d41862 100644 --- a/sonar-db/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml +++ b/sonar-db/src/main/resources/org/sonar/db/organization/OrganizationMapper.xml @@ -9,6 +9,7 @@ org.description as "description", org.url as "url", org.avatar_url as "avatarUrl", + org.guarded as "guarded", org.created_at as "createdAt", org.updated_at as "updatedAt" </sql> @@ -130,6 +131,7 @@ description, url, avatar_url, + guarded, created_at, updated_at ) @@ -141,6 +143,7 @@ #{organization.description, jdbcType=VARCHAR}, #{organization.url, jdbcType=VARCHAR}, #{organization.avatarUrl, jdbcType=VARCHAR}, + #{organization.guarded, jdbcType=BOOLEAN}, #{organization.createdAt, jdbcType=BIGINT}, #{organization.updatedAt, jdbcType=BIGINT} ) diff --git a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql index 00d131c627c..9ebdb68b1c9 100644 --- a/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql +++ b/sonar-db/src/main/resources/org/sonar/db/version/rows-h2.sql @@ -530,7 +530,7 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('1512'); INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, EXTERNAL_IDENTITY, EXTERNAL_IDENTITY_PROVIDER, USER_LOCAL, CRYPTED_PASSWORD, SALT, IS_ROOT, CREATED_AT, UPDATED_AT) VALUES (1, 'admin', 'Administrator', '', 'admin', 'sonarqube', true, 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', true, '1418215735482', '1418215735482'); ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2; -INSERT INTO ORGANIZATIONS (UUID, KEE, NAME, CREATED_AT, UPDATED_AT) VALUES ('AVdqnciQUUs7Zd3KPvFD', 'default-organization', 'Default Organization', '1474962596482', '1474962596482'); +INSERT INTO ORGANIZATIONS (UUID, KEE, NAME, GUARDED, CREATED_AT, UPDATED_AT) VALUES ('AVdqnciQUUs7Zd3KPvFD', 'default-organization', 'Default Organization', false, '1474962596482', '1474962596482'); INSERT INTO INTERNAL_PROPERTIES (KEE, IS_EMPTY, TEXT_VALUE, CREATED_AT) VALUES ('organization.default', false, 'AVdqnciQUUs7Zd3KPvFD', '1474962596482'); INSERT INTO GROUPS(ID, ORGANIZATION_UUID, NAME, DESCRIPTION, CREATED_AT, UPDATED_AT) VALUES (1, 'AVdqnciQUUs7Zd3KPvFD', 'sonar-administrators', 'System administrators', '2011-09-26 22:27:51.0', '2011-09-26 22:27:51.0'); |