summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a1fb290)
Change-Id: I921b638d0734b14eb2cd1f9389c20e7fb7b15922
}
public static boolean isInCatsLimit(int uID, int testID) {
}
public static boolean isInCatsLimit(int uID, int testID) {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `cats_passed` WHERE `user_id` = ? AND `variant_id` = ? AND`pass_date` > (now() - interval '1 months' * ?)")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `cats_passed` WHERE `user_id` = ? AND `variant_id` = ? AND`pass_date` > (now() - interval '1 months' * ?::INTEGER)")) {
ps.setInt(1, uID);
ps.setInt(2, testID);
ps.setInt(3, TEST_MONTHS);
ps.setInt(1, uID);
ps.setInt(2, testID);
ps.setInt(3, TEST_MONTHS);
}
private static void checkInsert(String suffix) throws GigiApiException {
}
private static void checkInsert(String suffix) throws GigiApiException {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `domains` WHERE (`domain`=? OR (CONCAT('.', `domain`)=RIGHT(?,LENGTH(`domain`)+1) OR RIGHT(`domain`,LENGTH(?)+1)=CONCAT('.',?))) AND `deleted` IS NULL")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `domains` WHERE (`domain`=? OR (CONCAT('.', `domain`)=RIGHT(?,LENGTH(`domain`)+1) OR RIGHT(`domain`,LENGTH(?)+1)=CONCAT('.',?::VARCHAR))) AND `deleted` IS NULL")) {
ps.setString(1, suffix);
ps.setString(2, suffix);
ps.setString(3, suffix);
ps.setString(1, suffix);
ps.setString(2, suffix);
ps.setString(3, suffix);
}
public User[] getMembers(int offset, int count) {
}
public User[] getMembers(int offset, int count) {
- try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `user` FROM `user_groups` WHERE `permission`=?::`userGroup` AND `deleted` IS NULL OFFSET ? LIMIT ?", true)) {
+ try (GigiPreparedStatement gps = new GigiPreparedStatement("SELECT `user` FROM `user_groups` WHERE `permission`=?::`userGroup` AND `deleted` IS NULL OFFSET ?::INTEGER LIMIT ?::INTEGER", true)) {
gps.setEnum(1, this);
gps.setInt(2, offset);
gps.setInt(3, count);
gps.setEnum(1, this);
gps.setInt(2, offset);
gps.setInt(3, count);
}
public static Organisation[] getOrganisations(int offset, int count) {
}
public static Organisation[] getOrganisations(int offset, int count) {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `certOwners`.`id` FROM `organisations` INNER JOIN `certOwners` ON `certOwners`.`id`=`organisations`.`id` WHERE `certOwners`.`deleted` IS NULL OFFSET ? LIMIT ?", true)) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `certOwners`.`id` FROM `organisations` INNER JOIN `certOwners` ON `certOwners`.`id`=`organisations`.`id` WHERE `certOwners`.`deleted` IS NULL OFFSET ?::INTEGER LIMIT ?::INTEGER", true)) {
ps.setInt(1, offset);
ps.setInt(2, count);
GigiResultSet res = ps.executeQuery();
ps.setInt(1, offset);
ps.setInt(2, count);
GigiResultSet res = ps.executeQuery();
}
public static User getResetWithToken(int id, String token) {
}
public static User getResetWithToken(int id, String token) {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `memid` FROM `passwordResetTickets` WHERE `id`=? AND `token`=? AND `used` IS NULL AND `created` > CURRENT_TIMESTAMP - interval '1 hours' * ?")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `memid` FROM `passwordResetTickets` WHERE `id`=? AND `token`=? AND `used` IS NULL AND `created` > CURRENT_TIMESTAMP - interval '1 hours' * ?::INTEGER")) {
ps.setInt(1, id);
ps.setString(2, token);
ps.setInt(3, PasswordResetPage.HOUR_MAX);
ps.setInt(1, id);
ps.setString(2, token);
ps.setInt(3, PasswordResetPage.HOUR_MAX);
}
public boolean isInVerificationLimit() {
}
public boolean isInVerificationLimit() {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` INNER JOIN `names` ON `names`.`id`=`to` WHERE `names`.`uid` = ? AND `when` > (now() - (interval '1 month' * ?)) AND (`expire` IS NULL OR `expire` > now()) AND `notary`.`deleted` IS NULL;")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` INNER JOIN `names` ON `names`.`id`=`to` WHERE `names`.`uid` = ? AND `when` > (now() - (interval '1 month' * ?::INTEGER)) AND (`expire` IS NULL OR `expire` > now()) AND `notary`.`deleted` IS NULL;")) {
ps.setInt(1, getId());
ps.setInt(2, VERIFICATION_MONTHS);
ps.setInt(1, getId());
ps.setInt(2, VERIFICATION_MONTHS);
@Override
public SuccessMessageResult submit(HttpServletRequest req) throws GigiApiException {
@Override
public SuccessMessageResult submit(HttpServletRequest req) throws GigiApiException {
- try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?;")) {
+ try (GigiPreparedStatement passwordReset = new GigiPreparedStatement("UPDATE `passwordResetTickets` SET `used` = CURRENT_TIMESTAMP WHERE `used` IS NULL AND `created` < CURRENT_TIMESTAMP - interval '1 hours' * ?::INTEGER;")) {
passwordReset.setInt(1, HOUR_MAX);
passwordReset.execute();
}
passwordReset.setInt(1, HOUR_MAX);
passwordReset.execute();
}
}
public static boolean checkVerificationIsPossible(User agent, Name target) {
}
public static boolean checkVerificationIsPossible(User agent, Name target) {
- try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` where `to`=? and `from`=? and `method` = ? ::`notaryType` AND `deleted` IS NULL AND `when` > (now() - interval '1 days' * ?)")) {
+ try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT 1 FROM `notary` where `to`=? and `from`=? and `method` = ? ::`notaryType` AND `deleted` IS NULL AND `when` > (now() - interval '1 days' * ?::INTEGER)")) {
ps.setInt(1, target.getId());
ps.setInt(2, agent.getId());
ps.setEnum(3, VerificationType.FACE_TO_FACE);
ps.setInt(1, target.getId());
ps.setInt(2, agent.getId());
ps.setEnum(3, VerificationType.FACE_TO_FACE);
projects / gigi.git / commitdiff