github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#6812] Added support for DERBY

Browse Source
This commit is contained in:
lukaseder 2017-12-19 16:02:12 +01:00
parent 9d310e5ee7
commit 36354bf2cb
8 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jOOQ/src/main/java/org/jooq/DSLContext.java
View File

@ -9563,37 +9563,37 @@ public interface DSLContext extends Scope , AutoCloseable {
/**
* Grant a privilege on a table to user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantOnStep grant(Privilege privilege);
/**
* Grant privileges on a table to user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantOnStep grant(Privilege... privileges);
/**
* Grant privileges on a table to user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantOnStep grant(Collection<? extends Privilege> privileges);
/**
* Revoke a privilege on table from user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeOnStep revoke(Privilege privilege);
/**
* Revoke privileges on table from user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeOnStep revoke(Privilege... privileges);
/**
* Revoke privileges on table from user or role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeOnStep revoke(Collection<? extends Privilege> privileges);
/**

7
jOOQ/src/main/java/org/jooq/GrantOnStep.java
View File

@ -37,6 +37,7 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
// ...
@ -55,13 +56,13 @@ public interface GrantOnStep {
/**
* Grant a privilege on a table.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantToStep on(Table<?> table);
/**
* Grant a privilege on a table.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantToStep on(Name table);
/**
@ -73,6 +74,6 @@ public interface GrantOnStep {
* escape literals when concatenated into SQL clauses!
*/
@PlainSQL
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantToStep on(String table);
}

7
jOOQ/src/main/java/org/jooq/GrantToStep.java
View File

@ -37,6 +37,7 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
// ...
@ -55,18 +56,18 @@ public interface GrantToStep {
/**
* Grant a privilege to a user.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantWithGrantOptionStep to(User user);
/**
* Grant a privilege to a role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantWithGrantOptionStep to(Role role);
/**
* Grant a privilege to <code>PUBLIC</code>.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
GrantWithGrantOptionStep toPublic();
}

7
jOOQ/src/main/java/org/jooq/RevokeFromStep.java
View File

@ -37,6 +37,7 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
// ...
@ -55,18 +56,18 @@ public interface RevokeFromStep {
/**
* Revoke a privilege from a user.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFinalStep from(User user);
/**
* Revoke a privilege from a role.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFinalStep from(Role role);
/**
* Revoke a privilege from <code>PUBLIC</code>.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFinalStep fromPublic();
}

7
jOOQ/src/main/java/org/jooq/RevokeOnStep.java
View File

@ -37,6 +37,7 @@
*/
package org.jooq;
import static org.jooq.SQLDialect.DERBY;
import static org.jooq.SQLDialect.H2;
import static org.jooq.SQLDialect.HSQLDB;
// ...
@ -55,13 +56,13 @@ public interface RevokeOnStep {
/**
* Revoke a privilege on a table.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFromStep on(Table<?> table);
/**
* Revoke a privilege on a table.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFromStep on(Name table);
/**
@ -73,6 +74,6 @@ public interface RevokeOnStep {
* escape literals when concatenated into SQL clauses!
*/
@PlainSQL
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
RevokeFromStep on(String table);
}

12
jOOQ/src/main/java/org/jooq/impl/DSL.java
View File

@ -7887,7 +7887,7 @@ public class DSL {
*
* @see #grant(Collection)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static GrantOnStep grant(Privilege privilege) {
return using(new DefaultConfiguration()).grant(privilege);
}
@ -7913,7 +7913,7 @@ public class DSL {
*
* @see #grant(Collection)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static GrantOnStep grant(Privilege... privileges) {
return using(new DefaultConfiguration()).grant(privileges);
}
@ -7939,7 +7939,7 @@ public class DSL {
*
* @see #grant(Privilege...)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static GrantOnStep grant(Collection<? extends Privilege> privileges) {
return using(new DefaultConfiguration()).grant(privileges);
}
@ -7965,7 +7965,7 @@ public class DSL {
*
* @see #revoke(Collection)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static RevokeOnStep revoke(Privilege privilege) {
return using(new DefaultConfiguration()).revoke(privilege);
}
@ -7991,7 +7991,7 @@ public class DSL {
*
* @see #revoke(Collection)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static RevokeOnStep revoke(Privilege... privileges) {
return using(new DefaultConfiguration()).revoke(privileges);
}
@ -8017,7 +8017,7 @@ public class DSL {
*
* @see #revoke(Privilege...)
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ DERBY, H2, HSQLDB, POSTGRES })
public static RevokeOnStep revoke(Collection<? extends Privilege> privileges) {
return using(new DefaultConfiguration()).revoke(privileges);
}

4
jOOQ/src/main/java/org/jooq/impl/GrantImpl.java
View File

@ -53,7 +53,6 @@ import java.util.Collection;
import org.jooq.Clause;
import org.jooq.Configuration;
import org.jooq.Context;
import org.jooq.GrantFinalStep;
import org.jooq.GrantOnStep;
import org.jooq.GrantToStep;
import org.jooq.GrantWithGrantOptionStep;
@ -72,8 +71,7 @@ final class GrantImpl extends AbstractQuery implements
// Cascading interface implementations for Select behaviour
GrantOnStep,
GrantToStep,
GrantWithGrantOptionStep,
GrantFinalStep {
GrantWithGrantOptionStep {
/**
* Generated UID

2
jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
View File

@ -1305,6 +1305,7 @@ class ParserImpl implements Parser {
}
parseKeyword(ctx, "ON");
parseKeywordIf(ctx, "TABLE");
Table<?> table = parseTableName(ctx);
parseKeyword(ctx, "TO");
@ -1330,6 +1331,7 @@ class ParserImpl implements Parser {
}
parseKeyword(ctx, "ON");
parseKeywordIf(ctx, "TABLE");
Table<?> table = parseTableName(ctx);
RevokeOnStep s1 = privileges == null ? ctx.dsl.revoke(privilege) : ctx.dsl.revoke(privileges);