Skip to content

Commit 670fb0e

Browse files
EricWittmannEricWittmann
committed
Use consistent column names for names/keys and values
1 parent 6fde2ce commit 670fb0e

File tree

9 files changed

+78
-78
lines changed

9 files changed

+78
-78
lines changed

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private void initializeDatabase(Handle handle) {
300300
log.debug("---");
301301

302302
statements.forEach(statement -> {
303-
log.info(statement);
303+
log.debug(statement);
304304
handle.createUpdate(statement).execute();
305305
});
306306
log.debug("---");
@@ -1055,7 +1055,7 @@ public ArtifactSearchResultsDto searchArtifacts(Set<SearchFilter> filters, Order
10551055
+ "v.groupId LIKE ? OR "
10561056
+ "a.artifactId LIKE ? OR "
10571057
+ "v.description LIKE ? OR "
1058-
+ "EXISTS(SELECT l.globalId FROM version_labels l WHERE l.pkey = ? AND l.globalId = v.globalId)");
1058+
+ "EXISTS(SELECT l.globalId FROM version_labels l WHERE l.labelKey = ? AND l.globalId = v.globalId)");
10591059
binders.add((query, idx) -> {
10601060
query.bind(idx, "%" + filter.getStringValue() + "%");
10611061
});
@@ -1104,13 +1104,13 @@ public ArtifactSearchResultsDto searchArtifacts(Set<SearchFilter> filters, Order
11041104
Pair<String, String> label = filter.getLabelFilterValue();
11051105
// Note: convert search to lowercase when searching for labels (case-insensitivity support).
11061106
String labelKey = label.getKey().toLowerCase();
1107-
where.append("EXISTS(SELECT l.globalId FROM version_labels l WHERE l.pkey = ?");
1107+
where.append("EXISTS(SELECT l.globalId FROM version_labels l WHERE l.labelKey = ?");
11081108
binders.add((query, idx) -> {
11091109
query.bind(idx, labelKey);
11101110
});
11111111
if (label.getValue() != null) {
11121112
String labelValue = label.getValue().toLowerCase();
1113-
where.append(" AND l.pvalue = ?");
1113+
where.append(" AND l.labelValue = ?");
11141114
binders.add((query, idx) -> {
11151115
query.bind(idx, labelValue);
11161116
});

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public List<String> databaseUpgrade(int fromVersion, int toVersion) {
5656
*/
5757
@Override
5858
public String getDatabaseVersion() {
59-
return "SELECT a.prop_value FROM apicurio a WHERE a.prop_name = ?";
59+
return "SELECT a.propValue FROM apicurio a WHERE a.propName = ?";
6060
}
6161

6262
/**
@@ -411,23 +411,23 @@ public String deleteVersionLabelsByGAV() {
411411
*/
412412
@Override
413413
public String insertVersionLabel() {
414-
return "INSERT INTO version_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)";
414+
return "INSERT INTO version_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)";
415415
}
416416

417417
/**
418418
* @see io.apicurio.registry.storage.impl.sql.SqlStatements#insertArtifactLabel()
419419
*/
420420
@Override
421421
public String insertArtifactLabel() {
422-
return "INSERT INTO artifact_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)";
422+
return "INSERT INTO artifact_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)";
423423
}
424424

425425
/**
426426
* @see io.apicurio.registry.storage.impl.sql.SqlStatements#insertGroupLabel()
427427
*/
428428
@Override
429429
public String insertGroupLabel() {
430-
return "INSERT INTO group_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)";
430+
return "INSERT INTO group_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)";
431431
}
432432

433433
/**
@@ -847,23 +847,23 @@ public String selectConfigProperties() {
847847
*/
848848
@Override
849849
public String selectConfigPropertyByName() {
850-
return "SELECT c.* FROM config c WHERE c.pname = ?";
850+
return "SELECT c.* FROM config c WHERE c.propName = ?";
851851
}
852852

853853
/**
854854
* @see io.apicurio.registry.storage.impl.sql.SqlStatements#deleteConfigProperty()
855855
*/
856856
@Override
857857
public String deleteConfigProperty() {
858-
return "DELETE FROM config WHERE pname = ?";
858+
return "DELETE FROM config WHERE propName = ?";
859859
}
860860

861861
/**
862862
* @see io.apicurio.registry.storage.impl.sql.SqlStatements#insertConfigProperty()
863863
*/
864864
@Override
865865
public String insertConfigProperty() {
866-
return "INSERT INTO config (pname, pvalue, modifiedOn) VALUES (?, ?, ?)";
866+
return "INSERT INTO config (propName, propValue, modifiedOn) VALUES (?, ?, ?)";
867867
}
868868

869869
/**
@@ -909,12 +909,12 @@ public String selectInboundContentReferencesByGAV() {
909909

910910
@Override
911911
public String insertSequenceValue() {
912-
return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?)";
912+
return "INSERT INTO sequences (seqName, seqValue) VALUES (?, ?)";
913913
}
914914

915915
@Override
916916
public String selectCurrentSequenceValue() {
917-
return "SELECT seq_value FROM sequences WHERE seq_name = ? ";
917+
return "SELECT seqValue FROM sequences WHERE seqName = ? ";
918918
}
919919

920920
@Override

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public String getNextSequenceValue() {
6565
*/
6666
@Override
6767
public String resetSequenceValue() {
68-
return "MERGE INTO sequences (seq_name, seq_value) KEY (seq_name) VALUES(?, ?)";
68+
return "MERGE INTO sequences (seqName, seqValue) KEY (seqName) VALUES(?, ?)";
6969
}
7070

7171
/**

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ public String upsertContent() {
5757
*/
5858
@Override
5959
public String getNextSequenceValue() {
60-
return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, 1) ON CONFLICT (seq_name) DO UPDATE SET seq_value = sequences.seq_value + 1 RETURNING seq_value";
60+
return "INSERT INTO sequences (seqName, seqValue) VALUES (?, 1) ON CONFLICT (seqName) DO UPDATE SET seqValue = sequences.seqValue + 1 RETURNING seqValue";
6161
}
6262

6363
/**
6464
* @see io.apicurio.registry.storage.impl.sql.SqlStatements#resetSequenceValue()
6565
*/
6666
@Override
6767
public String resetSequenceValue() {
68-
return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?) ON CONFLICT (seq_name) DO UPDATE SET seq_value = ?";
68+
return "INSERT INTO sequences (seqName, seqValue) VALUES (?, ?) ON CONFLICT (seqName) DO UPDATE SET seqValue = ?";
6969
}
7070

7171
/**

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ public String upsertContent() {
6666
public String getNextSequenceValue() {
6767
return String.join(" ",
6868
"MERGE INTO sequences AS target",
69-
"USING (VALUES (?)) AS source (seq_name)",
70-
"ON (target.seq_name = source.seq_name)",
69+
"USING (VALUES (?)) AS source (seqName)",
70+
"ON (target.seqName = source.seqName)",
7171
"WHEN MATCHED THEN",
72-
"UPDATE SET seq_value = target.seq_value + 1",
72+
"UPDATE SET seqValue = target.seqValue + 1",
7373
"WHEN NOT MATCHED THEN",
74-
"INSERT (seq_name, seq_value)",
75-
"VALUES (source.seq_name, 1)",
76-
"OUTPUT INSERTED.seq_value;");
74+
"INSERT (seqName, seqValue)",
75+
"VALUES (source.seqName, 1)",
76+
"OUTPUT INSERTED.seqValue;");
7777
}
7878

7979
/**
@@ -83,14 +83,14 @@ public String getNextSequenceValue() {
8383
public String resetSequenceValue() {
8484
return String.join(" ",
8585
"MERGE INTO sequences AS target",
86-
"USING (VALUES (?, ?)) AS source (seq_name, seq_value)",
87-
"ON (target.seq_name = source.seq_name)",
86+
"USING (VALUES (?, ?)) AS source (seqName, seqValue)",
87+
"ON (target.seqName = source.seqName)",
8888
"WHEN MATCHED THEN",
89-
"UPDATE SET seq_value = ?",
89+
"UPDATE SET seqValue = ?",
9090
"WHEN NOT MATCHED THEN",
91-
"INSERT (seq_name, seq_value)",
92-
"VALUES (source.seq_name, source.seq_value)",
93-
"OUTPUT INSERTED.seq_value;");
91+
"INSERT (seqName, seqValue)",
92+
"VALUES (source.seqName, source.seqValue)",
93+
"OUTPUT INSERTED.seqValue;");
9494
}
9595

9696
/**

‎app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/DynamicConfigPropertyDtoMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ private DynamicConfigPropertyDtoMapper() {
2121
*/
2222
@Override
2323
public DynamicConfigPropertyDto map(ResultSet rs) throws SQLException {
24-
String name = rs.getString("pname");
25-
String value = rs.getString("pvalue");
24+
String name = rs.getString("propName");
25+
String value = rs.getString("propValue");
2626
return new DynamicConfigPropertyDto(name, value);
2727
}
2828

‎app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
-- DDL for the Apicurio Registry - Database: H2
33
-- *********************************************************************
44

5-
CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255));
6-
ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
7-
INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100);
5+
CREATE TABLE apicurio (propName VARCHAR(255) NOT NULL, propValue VARCHAR(255));
6+
ALTER TABLE apicurio ADD PRIMARY KEY (propName);
7+
INSERT INTO apicurio (propName, propValue) VALUES ('db_version', 100);
88

9-
CREATE TABLE sequences (seq_name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL);
10-
ALTER TABLE sequences ADD PRIMARY KEY (seq_name);
9+
CREATE TABLE sequences (seqName VARCHAR(32) NOT NULL, seqValue BIGINT NOT NULL);
10+
ALTER TABLE sequences ADD PRIMARY KEY (seqName);
1111

12-
CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL);
13-
ALTER TABLE config ADD PRIMARY KEY (pname);
12+
CREATE TABLE config (propName VARCHAR(255) NOT NULL, propValue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL);
13+
ALTER TABLE config ADD PRIMARY KEY (propName);
1414
CREATE INDEX IDX_config_1 ON config(modifiedOn);
1515

1616
CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256));
@@ -36,10 +36,10 @@ ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KE
3636
CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT);
3737
ALTER TABLE groups ADD PRIMARY KEY (groupId);
3838

39-
CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512));
39+
CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512));
4040
ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE;
41-
CREATE INDEX IDX_glabels_1 ON group_labels(pkey);
42-
CREATE INDEX IDX_glabels_2 ON group_labels(pvalue);
41+
CREATE INDEX IDX_glabels_1 ON group_labels(labelKey);
42+
CREATE INDEX IDX_glabels_2 ON group_labels(labelValue);
4343

4444
CREATE TABLE group_rules (groupId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL);
4545
ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type);
@@ -51,10 +51,10 @@ CREATE HASH INDEX IDX_artifacts_0 ON artifacts(type);
5151
CREATE HASH INDEX IDX_artifacts_1 ON artifacts(createdBy);
5252
CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn);
5353

54-
CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512));
54+
CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512));
5555
ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE;
56-
CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey);
57-
CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue);
56+
CREATE INDEX IDX_alabels_1 ON artifact_labels(labelKey);
57+
CREATE INDEX IDX_alabels_2 ON artifact_labels(labelValue);
5858

5959
CREATE TABLE artifact_rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL);
6060
ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type);
@@ -78,10 +78,10 @@ CREATE HASH INDEX IDX_versions_5 ON versions(createdBy);
7878
CREATE INDEX IDX_versions_6 ON versions(createdOn);
7979
CREATE HASH INDEX IDX_versions_7 ON versions(contentId);
8080

81-
CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512));
81+
CREATE TABLE version_labels (globalId BIGINT NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512));
8282
ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE;
83-
CREATE INDEX IDX_vlabels_1 ON version_labels(pkey);
84-
CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue);
83+
CREATE INDEX IDX_vlabels_1 ON version_labels(labelKey);
84+
CREATE INDEX IDX_vlabels_2 ON version_labels(labelValue);
8585

8686
CREATE TABLE version_comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL);
8787
ALTER TABLE version_comments ADD PRIMARY KEY (commentId);

‎app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
-- DDL for the Apicurio Registry - Database: MS SQL Server
33
-- *********************************************************************
44

5-
CREATE TABLE apicurio (prop_name NVARCHAR(255) NOT NULL, prop_value NVARCHAR(255));
6-
ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
7-
INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100);
5+
CREATE TABLE apicurio (propName NVARCHAR(255) NOT NULL, propValue NVARCHAR(255));
6+
ALTER TABLE apicurio ADD PRIMARY KEY (propName);
7+
INSERT INTO apicurio (propName, propValue) VALUES ('db_version', 100);
88

9-
CREATE TABLE sequences (seq_name NVARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL);
10-
ALTER TABLE sequences ADD PRIMARY KEY (seq_name);
9+
CREATE TABLE sequences (seqName NVARCHAR(32) NOT NULL, seqValue BIGINT NOT NULL);
10+
ALTER TABLE sequences ADD PRIMARY KEY (seqName);
1111

12-
CREATE TABLE config (pname NVARCHAR(255) NOT NULL, pvalue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL);
13-
ALTER TABLE config ADD PRIMARY KEY (pname);
12+
CREATE TABLE config (propName NVARCHAR(255) NOT NULL, propValue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL);
13+
ALTER TABLE config ADD PRIMARY KEY (propName);
1414
CREATE INDEX IDX_config_1 ON config(modifiedOn);
1515

1616
CREATE TABLE acls (principalId NVARCHAR(256) NOT NULL, role NVARCHAR(32) NOT NULL, principalName NVARCHAR(256));
@@ -36,10 +36,10 @@ ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KE
3636
CREATE TABLE groups (groupId NVARCHAR(512) NOT NULL, description NVARCHAR(1024), artifactsType NVARCHAR(32), createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, modifiedBy NVARCHAR(256), modifiedOn DATETIME2(6), labels TEXT);
3737
ALTER TABLE groups ADD PRIMARY KEY (groupId);
3838

39-
CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512));
39+
CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512));
4040
ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE;
41-
CREATE INDEX IDX_glabels_1 ON group_labels(pkey);
42-
CREATE INDEX IDX_glabels_2 ON group_labels(pvalue);
41+
CREATE INDEX IDX_glabels_1 ON group_labels(labelKey);
42+
CREATE INDEX IDX_glabels_2 ON group_labels(labelValue);
4343

4444
CREATE TABLE group_rules (groupId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL);
4545
ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type);
@@ -51,10 +51,10 @@ CREATE INDEX IDX_artifacts_0 ON artifacts(type);
5151
CREATE INDEX IDX_artifacts_1 ON artifacts(createdBy);
5252
CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn);
5353

54-
CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512));
54+
CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512));
5555
ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE;
56-
CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey);
57-
CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue);
56+
CREATE INDEX IDX_alabels_1 ON artifact_labels(labelKey);
57+
CREATE INDEX IDX_alabels_2 ON artifact_labels(labelValue);
5858

5959
CREATE TABLE artifact_rules (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL);
6060
ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type);
@@ -78,10 +78,10 @@ CREATE INDEX IDX_versions_5 ON versions(createdBy);
7878
CREATE INDEX IDX_versions_6 ON versions(createdOn);
7979
CREATE INDEX IDX_versions_7 ON versions(contentId);
8080

81-
CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512));
81+
CREATE TABLE version_labels (globalId BIGINT NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512));
8282
ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE;
83-
CREATE INDEX IDX_vlabels_1 ON version_labels(pkey);
84-
CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue);
83+
CREATE INDEX IDX_vlabels_1 ON version_labels(labelKey);
84+
CREATE INDEX IDX_vlabels_2 ON version_labels(labelValue);
8585

8686
CREATE TABLE version_comments (commentId NVARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, cvalue NVARCHAR(1024) NOT NULL);
8787
ALTER TABLE version_comments ADD PRIMARY KEY (commentId);

0 commit comments

Comments
 (0)