Skip to content

Bugfix/issue 22 self #28

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

Merged
merged 2 commits into from
Sep 4, 2020
Merged

Bugfix/issue 22 self #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77dd280
add test cases for self as in and in/out parameter
PhilippSalvisberg Sep 4, 2020
4655f66
do not check name for self parameter
PhilippSalvisberg Sep 4, 2020
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
24 changes: 13 additions & 11 deletions src/main/java/com/trivadis/tvdcc/validators/TrivadisPlsqlNaming.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,19 @@ class TrivadisPlsqlNaming extends PLSQLJavaValidator implements PLSQLCopValidato
val parent = p.eContainer
if (!(parent instanceof CursorDeclarationOrDefinition)) {
val name = p.parameter.value.toLowerCase
if (p.in && p.out) {
if (!name.startsWith(PREFIX_IN_OUT_PARAMETER_NAME)) {
warning(ISSUE_IN_OUT_PARAMETER_NAME, p.parameter, p)
}
} else if (p.out) {
if (!name.startsWith(PREFIX_OUT_PARAMETER_NAME)) {
warning(ISSUE_OUT_PARAMETER_NAME, p.parameter, p)
}
} else if (!p.self) {
if (!name.startsWith(PREFIX_IN_PARAMETER_NAME)) {
warning(ISSUE_IN_PARAMETER_NAME, p.parameter, p)
if (name != "self") {
if (p.in && p.out) {
if (!name.startsWith(PREFIX_IN_OUT_PARAMETER_NAME)) {
warning(ISSUE_IN_OUT_PARAMETER_NAME, p.parameter, p)
}
} else if (p.out) {
if (!name.startsWith(PREFIX_OUT_PARAMETER_NAME)) {
warning(ISSUE_OUT_PARAMETER_NAME, p.parameter, p)
}
} else {
if (!name.startsWith(PREFIX_IN_PARAMETER_NAME)) {
warning(ISSUE_IN_PARAMETER_NAME, p.parameter, p)
}
}
}
}
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/com/trivadis/tvdcc/validators/tests/TrivadisPlsqlNamingTest.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,23 @@ class TrivadisPlsqlNamingTest extends AbstractValidatorTest {
Assert.assertEquals(0, issues.filter[it.code == "G-9008"].size)
}

@Test
def void SelfInParameterNameOk() {
val stmt = '''
CREATE OR REPLACE TYPE rectangle AUTHID definer AS OBJECT (
rect_length NUMBER,
rect_width NUMBER,
member FUNCTION get_surface (
self IN rectangle
) RETURN NUMBER
);
'''
val issues = stmt.issues
Assert.assertEquals(0, issues.filter[it.code == "G-9008"].size)
}



@Test
def void outParameterNameNok() {
val stmt = '''
Expand Down Expand Up @@ -375,6 +392,22 @@ class TrivadisPlsqlNamingTest extends AbstractValidatorTest {
Assert.assertEquals(0, issues.filter[it.code == "G-9010"].size)
}

@Test
def void SelfInOutParameterNameOk() {
val stmt = '''
CREATE OR REPLACE TYPE rectangle AUTHID definer AS OBJECT (
rect_length NUMBER,
rect_width NUMBER,
CONSTRUCTOR FUNCTION rectangle (
self IN OUT NOCOPY rectangle,
in_length_and_width IN NUMBER
) RETURN SELF AS RESULT
);
'''
val issues = stmt.issues
Assert.assertEquals(0, issues.filter[it.code == "G-9010"].size)
}

@Test
def void recordTypeNameNok() {
val stmt = '''
Expand Down