From 2f9325ea5fda2744a628b7904a4b0e7f7f6ceb82 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Thu, 5 Dec 2019 16:04:03 +0100 Subject: [PATCH] [jOOQ/jOOQ#9425] Diff support for ALTER .. SET DATA TYPE See also [jOOQ/jOOQ#9632] --- jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java | 7 ++++++- jOOQ/src/main/java/org/jooq/impl/Diff.java | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java index 46be4c6522..6c145f766e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java +++ b/jOOQ/src/main/java/org/jooq/impl/DDLInterpreter.java @@ -74,6 +74,7 @@ import org.jooq.Meta; import org.jooq.Name; import org.jooq.Name.Quoted; import org.jooq.Named; +import org.jooq.Nullability; import org.jooq.Query; import org.jooq.Record; import org.jooq.Schema; @@ -477,7 +478,11 @@ final class DDLInterpreter { if (query.$alterColumnNullability() != null) existingField.type = existingField.type.nullability(query.$alterColumnNullability()); else if (query.$alterColumnType() != null) - existingField.type = query.$alterColumnType(); + existingField.type = query.$alterColumnType().nullability( + query.$alterColumnType().nullability() == Nullability.DEFAULT + ? existingField.type.nullability() + : query.$alterColumnType().nullability() + ); else if (query.$alterColumnDefault() != null) existingField.type = existingField.type.default_((Field) query.$alterColumnDefault()); else if (query.$alterColumnDropDefault()) diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index fb4199262a..07f030c328 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -681,6 +681,12 @@ package org.jooq.impl; + + + + + +