From fcf396140e14958fa51c159dafa70c7f358a04ce Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Fri, 13 Apr 2012 09:32:40 +0000
Subject: [PATCH] [#1304] Add option to generate JSR-303 @NotNull and @Size
 annotations to generated POJO's

---
 .../java/org/jooq/util/DefaultGenerator.java  | 100 +++--
 .../java/org/jooq/util/GenerationTool.java    |   4 +-
 .../java/org/jooq/util/GenerationWriter.java  |  22 +-
 .../main/java/org/jooq/util/Generator.java    |  15 +-
 jOOQ-meta/pom.xml                             |   2 +-
 .../main/resources/xsd/jooq-codegen-2.3.0.xsd | 367 ++++++++++++++++++
 .../configuration/lukas/oracle/library.xml    |   1 +
 .../lukas/sqlserver/adventureworks.xml        |   1 +
 .../dbo/tables/pojos/AWBuildVersion.java      |  11 +-
 .../dbo/tables/pojos/DatabaseLog.java         |  20 +-
 .../dbo/tables/pojos/ErrorLog.java            |  16 +-
 .../tables/pojos/Department.java              |  12 +-
 .../humanresources/tables/pojos/Employee.java |  37 +-
 .../tables/pojos/EmployeeAddress.java         |  10 +-
 .../pojos/EmployeeDepartmentHistory.java      |  12 +-
 .../tables/pojos/EmployeePayHistory.java      |  12 +-
 .../tables/pojos/JobCandidate.java            |   6 +-
 .../humanresources/tables/pojos/Shift.java    |  13 +-
 .../tables/pojos/vEmployee.java               |  42 +-
 .../tables/pojos/vEmployeeDepartment.java     |  27 +-
 .../pojos/vEmployeeDepartmentHistory.java     |  27 +-
 .../tables/pojos/vJobCandidate.java           |  26 +-
 .../tables/pojos/vJobCandidateEducation.java  |  22 +-
 .../tables/pojos/vJobCandidateEmployment.java |   8 +-
 .../person/tables/pojos/Address.java          |  21 +-
 .../person/tables/pojos/AddressType.java      |  11 +-
 .../person/tables/pojos/Contact.java          |  34 +-
 .../person/tables/pojos/ContactType.java      |   9 +-
 .../person/tables/pojos/CountryRegion.java    |  10 +-
 .../person/tables/pojos/StateProvince.java    |  21 +-
 .../tables/pojos/vAdditionalContactInfo.java  |  32 +-
 .../pojos/vStateProvinceCountryRegion.java    |  20 +-
 .../tables/pojos/BillOfMaterials.java         |  17 +-
 .../production/tables/pojos/Culture.java      |  10 +-
 .../production/tables/pojos/Document.java     |  22 +-
 .../production/tables/pojos/Illustration.java |   6 +-
 .../production/tables/pojos/Location.java     |  13 +-
 .../production/tables/pojos/Product.java      |  44 ++-
 .../tables/pojos/ProductCategory.java         |  11 +-
 .../tables/pojos/ProductCostHistory.java      |  10 +-
 .../tables/pojos/ProductDescription.java      |  11 +-
 .../tables/pojos/ProductDocument.java         |   8 +-
 .../tables/pojos/ProductInventory.java        |  17 +-
 .../tables/pojos/ProductListPriceHistory.java |  10 +-
 .../production/tables/pojos/ProductModel.java |  11 +-
 .../pojos/ProductModelIllustration.java       |   8 +-
 ...ProductModelProductDescriptionCulture.java |  11 +-
 .../production/tables/pojos/ProductPhoto.java |  10 +-
 .../tables/pojos/ProductProductPhoto.java     |  10 +-
 .../tables/pojos/ProductReview.java           |  20 +-
 .../tables/pojos/ProductSubcategory.java      |  13 +-
 .../production/tables/pojos/ScrapReason.java  |   9 +-
 .../tables/pojos/TransactionHistory.java      |  21 +-
 .../pojos/TransactionHistoryArchive.java      |  21 +-
 .../production/tables/pojos/UnitMeasure.java  |  10 +-
 .../production/tables/pojos/WorkOrder.java    |  18 +-
 .../tables/pojos/WorkOrderRouting.java        |  18 +-
 .../tables/pojos/vProductAndDescription.java  |  16 +-
 .../vProductModelCatalogDescription.java      |  47 ++-
 .../pojos/vProductModelInstructions.java      |  13 +-
 .../tables/pojos/ProductVendor.java           |  19 +-
 .../tables/pojos/PurchaseOrderDetail.java     |  24 +-
 .../tables/pojos/PurchaseOrderHeader.java     |  26 +-
 .../purchasing/tables/pojos/ShipMethod.java   |  15 +-
 .../purchasing/tables/pojos/Vendor.java       |  20 +-
 .../tables/pojos/VendorAddress.java           |  10 +-
 .../tables/pojos/VendorContact.java           |  10 +-
 .../purchasing/tables/pojos/vVendor.java      |  45 ++-
 .../sales/tables/pojos/ContactCreditCard.java |   8 +-
 .../tables/pojos/CountryRegionCurrency.java   |  10 +-
 .../sales/tables/pojos/CreditCard.java        |  16 +-
 .../sales/tables/pojos/Currency.java          |  10 +-
 .../sales/tables/pojos/CurrencyRate.java      |  18 +-
 .../sales/tables/pojos/Customer.java          |  14 +-
 .../sales/tables/pojos/CustomerAddress.java   |  12 +-
 .../sales/tables/pojos/Individual.java        |   8 +-
 .../sales/tables/pojos/SalesOrderDetail.java  |  24 +-
 .../sales/tables/pojos/SalesOrderHeader.java  |  47 ++-
 .../pojos/SalesOrderHeaderSalesReason.java    |   8 +-
 .../sales/tables/pojos/SalesPerson.java       |  16 +-
 .../tables/pojos/SalesPersonQuotaHistory.java |  12 +-
 .../sales/tables/pojos/SalesReason.java       |  12 +-
 .../sales/tables/pojos/SalesTaxRate.java      |  17 +-
 .../sales/tables/pojos/SalesTerritory.java    |  25 +-
 .../tables/pojos/SalesTerritoryHistory.java   |  12 +-
 .../sales/tables/pojos/ShoppingCartItem.java  |  15 +-
 .../sales/tables/pojos/SpecialOffer.java      |  25 +-
 .../tables/pojos/SpecialOfferProduct.java     |  10 +-
 .../sales/tables/pojos/Store.java             |  11 +-
 .../sales/tables/pojos/StoreContact.java      |  12 +-
 .../tables/pojos/vIndividualCustomer.java     |  42 +-
 .../tables/pojos/vIndividualDemographics.java |  14 +-
 .../sales/tables/pojos/vSalesPerson.java      |  50 ++-
 .../pojos/vSalesPersonSalesByFiscalYears.java |  10 +-
 .../tables/pojos/vStoreWithDemographics.java  |  58 ++-
 .../multi_schema/tables/pojos/TAuthor.java    |   9 +-
 .../multi_schema/tables/pojos/TBook.java      |  15 +-
 .../multi_schema/tables/pojos/TBookSale.java  |  13 +-
 .../test/tables/pojos/TArrays.java            |   4 +-
 .../test/tables/pojos/TAuthor.java            |   9 +-
 .../test/tables/pojos/TBook.java              |  15 +-
 .../test/tables/pojos/TBookStore.java         |   5 +-
 .../test/tables/pojos/TBookToBookStore.java   |   7 +-
 .../test/tables/pojos/TBooleans.java          |   4 +-
 .../test/tables/pojos/TDates.java             |   4 +-
 .../test/tables/pojos/TDirectory.java         |   6 +-
 .../test/tables/pojos/TTriggers.java          |   8 +-
 .../test/tables/pojos/T_639NumbersTable.java  |   4 +-
 .../test/tables/pojos/T_725LobTest.java       |   4 +-
 .../test/tables/pojos/T_785.java              |   6 +-
 .../test/tables/pojos/VAuthor.java            |   9 +-
 .../test/tables/pojos/VBook.java              |  15 +-
 .../test/tables/pojos/VLibrary.java           |   7 +-
 .../test/tables/pojos/XTestCase_64_69.java    |   4 +-
 .../test/tables/pojos/XTestCase_71.java       |   4 +-
 .../test/tables/pojos/XTestCase_85.java       |   6 +-
 .../test/tables/pojos/XUnused.java            |  11 +-
 jOOQ/pom.xml                                  |   8 +
 118 files changed, 2120 insertions(+), 148 deletions(-)
 create mode 100644 jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.3.0.xsd

diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
index c0fc86db1a..96dd330775 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/DefaultGenerator.java
@@ -44,7 +44,6 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.TypeVariable;
 import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -107,16 +106,17 @@ import org.jooq.util.GeneratorStrategy.Mode;
  */
 public class DefaultGenerator implements Generator {
 
-    private static final JooqLogger  log                         = JooqLogger.getLogger(DefaultGenerator.class);
+    private static final JooqLogger  log                           = JooqLogger.getLogger(DefaultGenerator.class);
 
-    private boolean                  generateDeprecated          = true;
-    private boolean                  generateRelations           = false;
-    private boolean                  generateNavigationMethods   = true;
-    private boolean                  generateInstanceFields      = true;
-    private boolean                  generateGeneratedAnnotation = true;
-    private boolean                  generatePojos               = false;
-    private boolean                  generateRecords             = true;
-    private boolean                  generateJPAAnnotations      = false;
+    private boolean                  generateDeprecated            = true;
+    private boolean                  generateRelations             = false;
+    private boolean                  generateNavigationMethods     = true;
+    private boolean                  generateInstanceFields        = true;
+    private boolean                  generateGeneratedAnnotation   = true;
+    private boolean                  generatePojos                 = false;
+    private boolean                  generateRecords               = true;
+    private boolean                  generateJPAAnnotations        = false;
+    private boolean                  generateValidationAnnotations = false;
 
     private GeneratorStrategyWrapper strategy;
 
@@ -210,6 +210,16 @@ public class DefaultGenerator implements Generator {
         this.generateJPAAnnotations = generateJPAAnnotations;
     }
 
+    @Override
+    public boolean generateValidationAnnotations() {
+        return generateValidationAnnotations;
+    }
+
+    @Override
+    public void setGenerateValidationAnnotations(boolean generateValidationAnnotations) {
+        this.generateValidationAnnotations = generateValidationAnnotations;
+    }
+
     // ----
 
     @Override
@@ -235,7 +245,7 @@ public class DefaultGenerator implements Generator {
     // ----
 
     @Override
-	public void generate(Database database) throws SQLException, IOException {
+	public void generate(Database database) throws IOException {
         StopWatch watch = new StopWatch();
 
         log.info("Database parameters");
@@ -252,6 +262,7 @@ public class DefaultGenerator implements Generator {
 	    log.info("  generated annotation", generateGeneratedAnnotation());
 	    log.info("  instance fields", generateInstanceFields());
 	    log.info("  JPA annotations", generateJPAAnnotations());
+	    log.info("  validation annotations", generateValidationAnnotations());
 	    log.info("  navigation methods", generateNavigationMethods());
 	    log.info("  records", generateRecords());
 	    log.info("  pojos", generatePojos());
@@ -279,7 +290,7 @@ public class DefaultGenerator implements Generator {
     private void generate(
             Database database,
             SchemaDefinition schema,
-            StopWatch watch) throws SQLException, IOException {
+            StopWatch watch) throws IOException {
 
         File targetSchemaDir = strategy.getFile(schema).getParentFile();
 
@@ -838,6 +849,8 @@ public class DefaultGenerator implements Generator {
                     }
 
                     for (ColumnDefinition column : table.getColumns()) {
+                        printColumnValidationAnnotation(out, column);
+
                         out.print("\tprivate ");
                         out.print(StringUtils.rightPad(getJavaType(column.getType()), maxLength));
                         out.print(" ");
@@ -1741,6 +1754,29 @@ public class DefaultGenerator implements Generator {
         }
     }
 
+    private void printColumnValidationAnnotation(GenerationWriter out, ColumnDefinition column) {
+        if (generateJPAAnnotations()) {
+            DataTypeDefinition type = column.getType();
+
+            boolean newline = true;
+            if (!column.isNullable()) {
+                newline = out.println(newline);
+                out.println("\t@javax.validation.constraints.NotNull");
+            }
+
+            if ("java.lang.String".equals(getJavaType(type))) {
+                int length = type.getLength();
+
+                if (length > 0) {
+                    newline = out.println(newline);
+                    out.print("\t@javax.validation.constraints.Size(max = ");
+                    out.print(length);
+                    out.println(")");
+                }
+            }
+        }
+    }
+
     private void registerInSchema(GenerationWriter outS, List<? extends Definition> definitions, Class<?> type, boolean isGeneric) {
         if (outS != null) {
             outS.println();
@@ -1789,7 +1825,7 @@ public class DefaultGenerator implements Generator {
     }
 
     private void printRoutine(Database database, SchemaDefinition schema, RoutineDefinition routine)
-        throws FileNotFoundException, SQLException {
+        throws FileNotFoundException {
         log.info("Generating routine", strategy.getFileName(routine));
 
         GenerationWriter out = new GenerationWriter(strategy.getFile(routine));
@@ -1948,7 +1984,7 @@ public class DefaultGenerator implements Generator {
         out.close();
     }
 
-    private void printConvenienceMethodFunctionAsField(GenerationWriter out, RoutineDefinition function, boolean parametersAsField) throws SQLException {
+    private void printConvenienceMethodFunctionAsField(GenerationWriter out, RoutineDefinition function, boolean parametersAsField) {
         // [#281] - Java can't handle more than 255 method parameters
         if (function.getInParameters().size() > 254) {
             log.warn("Too many parameters", "Function " + function + " has more than 254 in parameters. Skipping generation of convenience method.");
@@ -2019,7 +2055,7 @@ public class DefaultGenerator implements Generator {
         out.println("\t}");
     }
 
-    private void printConvenienceMethodFunction(GenerationWriter out, RoutineDefinition function, boolean instance) throws SQLException {
+    private void printConvenienceMethodFunction(GenerationWriter out, RoutineDefinition function, boolean instance) {
         // [#281] - Java can't handle more than 255 method parameters
         if (function.getInParameters().size() > 254) {
             log.warn("Too many parameters", "Function " + function + " has more than 254 in parameters. Skipping generation of convenience method.");
@@ -2125,7 +2161,7 @@ public class DefaultGenerator implements Generator {
         out.println("\tprivate " + javaClassName + "() {}");
     }
 
-    private void printConvenienceMethodProcedure(GenerationWriter out, RoutineDefinition procedure, boolean instance) throws SQLException {
+    private void printConvenienceMethodProcedure(GenerationWriter out, RoutineDefinition procedure, boolean instance) {
         // [#281] - Java can't handle more than 255 method parameters
         if (procedure.getInParameters().size() > 254) {
             log.warn("Too many parameters", "Procedure " + procedure + " has more than 254 in parameters. Skipping generation of convenience method.");
@@ -2328,7 +2364,7 @@ public class DefaultGenerator implements Generator {
 		}
 	}
 
-	private void printGetterAndSetter(GenerationWriter out, TypedElementDefinition<?> element) throws SQLException {
+	private void printGetterAndSetter(GenerationWriter out, TypedElementDefinition<?> element) {
 		printFieldJavaDoc(out, element);
 		out.println("\tpublic void " + strategy.getJavaSetterName(element, Mode.DEFAULT) + "(" + getJavaType(element.getType()) + " value) {");
 		out.println("\t\tsetValue(" + strategy.getFullJavaIdentifier(element) + ", value);");
@@ -2512,21 +2548,21 @@ public class DefaultGenerator implements Generator {
 		}
 	}
 
-    private void printUDTColumn(GenerationWriter out, AttributeDefinition attribute, Definition table) throws SQLException {
+    private void printUDTColumn(GenerationWriter out, AttributeDefinition attribute, Definition table) {
         Class<?> declaredMemberClass = UDTField.class;
         printColumnDefinition(out, attribute, table, declaredMemberClass);
     }
 
-    private void printTableColumn(GenerationWriter out, ColumnDefinition column, Definition table) throws SQLException {
+    private void printTableColumn(GenerationWriter out, ColumnDefinition column, Definition table) {
         Class<?> declaredMemberClass = TableField.class;
         printColumnDefinition(out, column, table, declaredMemberClass);
     }
 
-	private void printParameter(GenerationWriter out, ParameterDefinition parameter, Definition proc) throws SQLException {
+	private void printParameter(GenerationWriter out, ParameterDefinition parameter, Definition proc) {
 		printColumnDefinition(out, parameter, proc, Parameter.class);
 	}
 
-	private void printColumnDefinition(GenerationWriter out, TypedElementDefinition<?> column, Definition type, Class<?> declaredMemberClass) throws SQLException {
+	private void printColumnDefinition(GenerationWriter out, TypedElementDefinition<?> column, Definition type, Class<?> declaredMemberClass) {
 		printFieldJavaDoc(out, column);
 
 		boolean hasType =
@@ -2596,11 +2632,11 @@ public class DefaultGenerator implements Generator {
 		out.println(");");
 	}
 
-	private void printFieldJavaDoc(GenerationWriter out, TypedElementDefinition<?> element) throws SQLException {
+	private void printFieldJavaDoc(GenerationWriter out, TypedElementDefinition<?> element) {
 	    printFieldJavaDoc(out, element, null);
 	}
 
-    private void printFieldJavaDoc(GenerationWriter out, TypedElementDefinition<?> element, String deprecation) throws SQLException {
+    private void printFieldJavaDoc(GenerationWriter out, TypedElementDefinition<?> element, String deprecation) {
 		out.println();
 		out.println("\t/**");
 
@@ -2754,15 +2790,15 @@ public class DefaultGenerator implements Generator {
 		out.println();
 	}
 
-    private void printExtendsNumberType(GenerationWriter out, DataTypeDefinition type) throws SQLException {
+    private void printExtendsNumberType(GenerationWriter out, DataTypeDefinition type) {
         printNumberType(out, type, "? extends ");
     }
 
-    private void printNumberType(GenerationWriter out, DataTypeDefinition type) throws SQLException {
+    private void printNumberType(GenerationWriter out, DataTypeDefinition type) {
         printNumberType(out, type, "");
     }
 
-    private void printNumberType(GenerationWriter out, DataTypeDefinition type, String prefix) throws SQLException {
+    private void printNumberType(GenerationWriter out, DataTypeDefinition type, String prefix) {
         if (type.isGenericNumberType()) {
             out.print(prefix);
             out.print(Number.class);
@@ -2772,11 +2808,11 @@ public class DefaultGenerator implements Generator {
         }
     }
 
-	private String getSimpleJavaType(DataTypeDefinition type) throws SQLException {
+	private String getSimpleJavaType(DataTypeDefinition type) {
         return GenerationUtil.getSimpleJavaType(getJavaType(type));
     }
 
-    private String getJavaTypeReference(Database db, DataTypeDefinition type) throws SQLException {
+    private String getJavaTypeReference(Database db, DataTypeDefinition type) {
         if (type instanceof MasterDataTypeDefinition) {
             StringBuilder sb = new StringBuilder();
 
@@ -2799,7 +2835,7 @@ public class DefaultGenerator implements Generator {
         }
     }
 
-    private String getJavaType(DataTypeDefinition type) throws SQLException {
+    private String getJavaType(DataTypeDefinition type) {
         if (type instanceof MasterDataTypeDefinition) {
             return strategy.getFullJavaClassName(((MasterDataTypeDefinition) type).table);
         }
@@ -2815,7 +2851,7 @@ public class DefaultGenerator implements Generator {
         }
     }
 
-    private String getType(Database db, SchemaDefinition schema, String t, int p, int s, String u, String defaultType) throws SQLException {
+    private String getType(Database db, SchemaDefinition schema, String t, int p, int s, String u, String defaultType) {
         String type = defaultType;
 
         // Array types
@@ -2874,7 +2910,7 @@ public class DefaultGenerator implements Generator {
         return type;
     }
 
-    private String getTypeReference(Database db, SchemaDefinition schema, String t, int p, int s, String u) throws SQLException {
+    private String getTypeReference(Database db, SchemaDefinition schema, String t, int p, int s, String u) {
         StringBuilder sb = new StringBuilder();
         if (db.getArray(schema, u) != null) {
             ArrayDefinition array = db.getArray(schema, u);
@@ -2977,7 +3013,7 @@ public class DefaultGenerator implements Generator {
         return sb.toString();
     }
 
-    private boolean match(DataTypeDefinition type1, DataTypeDefinition type2) throws SQLException {
+    private boolean match(DataTypeDefinition type1, DataTypeDefinition type2) {
         return getJavaType(type1).equals(getJavaType(type2));
     }
 }
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index 1f97d02b54..eb1ba5d142 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -118,11 +118,11 @@ public class GenerationTool {
     		    // TODO [#1201] Add better error handling here
     		    xml = xml.replaceAll(
     		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-\\d+\\.\\d+\\.\\d+.xsd\">",
-    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd\">");
+    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd\">");
 
     		    xml = xml.replace(
     		        "<configuration>",
-    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd\">");
+    		        "<configuration xmlns=\"http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd\">");
 
     		    main(JAXB.unmarshal(new StringReader(xml), Configuration.class));
     		}
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationWriter.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationWriter.java
index ab7a57daed..fcd64399e3 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationWriter.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationWriter.java
@@ -73,20 +73,38 @@ public class GenerationWriter {
         initialisationStatements.add(statement);
     }
 
+    public void print(int value) {
+        sb.append(value);
+    }
+
     public void print(CharSequence string) {
         sb.append(string);
     }
 
+    public void println(int value) {
+        print(value);
+        println();
+    }
+
     public void println(CharSequence string) {
-        sb.append(string + "\n");
+        print(string);
+        println();
     }
 
     public void println() {
         sb.append("\n");
     }
 
+    public boolean println(boolean doPrint) {
+        if (doPrint) {
+            println();
+        }
+
+        return false;
+    }
+
     public void print(Class<?> clazz) {
-        sb.append(clazz.getCanonicalName());
+        print(clazz.getCanonicalName());
     }
 
     public boolean printOnlyOnce(Object object) {
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
index 6475e81327..006dfc2e89 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/Generator.java
@@ -37,7 +37,6 @@
 package org.jooq.util;
 
 import java.io.IOException;
-import java.sql.SQLException;
 
 import javax.annotation.Generated;
 
@@ -51,7 +50,7 @@ public interface Generator {
 	/**
 	 * Do the code generation
 	 */
-	void generate(Database database) throws SQLException, IOException;
+	void generate(Database database) throws IOException;
 
 	/**
 	 * Set a naming strategy to this generator
@@ -143,6 +142,18 @@ public interface Generator {
      */
     void setGenerateJPAAnnotations(boolean generateJPAAnnotations);
 
+    /**
+     * Whether POJO's and records should be annotated with JSR-303 validation
+     * annotations
+     */
+    boolean generateValidationAnnotations();
+
+    /**
+     * Whether POJO's and records should be annotated with JSR-303 validation
+     * annotations
+     */
+    void setGenerateValidationAnnotations(boolean generateValidationAnnotations);
+
     /**
      * The target directory
      */
diff --git a/jOOQ-meta/pom.xml b/jOOQ-meta/pom.xml
index f00b90f637..ef3ddf8f6e 100644
--- a/jOOQ-meta/pom.xml
+++ b/jOOQ-meta/pom.xml
@@ -55,7 +55,7 @@
 			        <strict>false</strict>
 			        <schemaDirectory>src/main/resources/xsd</schemaDirectory>
 			        <schemaIncludes>
-			            <include>jooq-codegen-2.1.0.xsd</include>
+			            <include>jooq-codegen-2.3.0.xsd</include>
 			        </schemaIncludes>
 			        <generatePackage>org.jooq.util.jaxb</generatePackage>
 			        <args>
diff --git a/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.3.0.xsd b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.3.0.xsd
new file mode 100644
index 0000000000..5dd2826491
--- /dev/null
+++ b/jOOQ-meta/src/main/resources/xsd/jooq-codegen-2.3.0.xsd
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+  xmlns:tns="http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd"
+  targetNamespace="http://www.jooq.org/xsd/jooq-codegen-2.3.0.xsd"
+  elementFormDefault="qualified">
+
+  <element name="configuration">
+    <complexType>
+      <all>
+        <!--
+          The JDBC configuration element contains information about how
+          to set up the database connection used for source code generation
+          -->
+        <element name="jdbc" type="tns:Jdbc" minOccurs="1"
+          maxOccurs="1" />
+
+        <!--
+          The GENERATOR configuration element contains information about
+          source code generation itself
+          -->
+        <element name="generator" type="tns:Generator" minOccurs="1"
+          maxOccurs="1" />
+      </all>
+    </complexType>
+  </element>
+
+  <complexType name="Jdbc">
+    <all>
+      <!-- The JDBC driver -->
+      <element name="driver" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- The JDBC connection URL -->
+      <element name="url" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- Deprecated. Use database schema configuration elements instead -->
+      <element name="schema" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The JDBC connection user. Be sure this user has all required
+        GRANTs to the dictionary views/tables to generate the desired artefacts
+        -->
+      <element name="user" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!-- The JDBC connection password -->
+      <element name="password" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Enlist custom JDBC driver properties that are provided to the
+        java.sql.DriverManager when fetching a connection
+        -->
+      <element name="properties" type="tns:Properties" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Properties">
+  	<sequence>
+  	  <element name="property" type="tns:Property" minOccurs="0" maxOccurs="unbounded"/>
+  	</sequence>
+  </complexType>
+
+  <complexType name="Property">
+  	<all>
+  	  <element name="key" type="string" minOccurs="1" maxOccurs="1"/>
+  	  <element name="value" type="string" minOccurs="1" maxOccurs="1"/>
+  	</all>
+  </complexType>
+
+  <complexType name="Generator">
+    <all>
+      <!--
+       The class used to generate source code. You may override this with
+       your custom source code generator
+       -->
+      <element name="name" type="string" default="org.jooq.util.DefaultGenerator"
+        minOccurs="0" maxOccurs="1" />
+
+      <!-- The naming strategy used for class and field names -->
+      <element name="strategy" type="tns:Strategy" minOccurs="0" maxOccurs="1" />
+
+      <!-- The jooq-meta configuration -->
+      <element name="database" type="tns:Database" minOccurs="1" maxOccurs="1" />
+
+      <!-- The jooq-codegen configuration -->
+      <element name="generate" type="tns:Generate" minOccurs="0" maxOccurs="1" />
+
+      <!-- Some information about generation output -->
+      <element name="target" type="tns:Target" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Strategy">
+    <all>
+      <!--
+        The class used to provide a naming strategy for generated source
+        code. You may override this with your custom naming strategy
+        -->
+      <element name="name" type="string" minOccurs="0" maxOccurs="1"
+        default="org.jooq.util.DefaultGeneratorStrategy" />
+    </all>
+  </complexType>
+
+  <complexType name="Database">
+    <all>
+      <!--
+        The database dialect from jooq-meta. Available dialects are
+        named org.util.[database].[database]Database. Known values are:
+
+        org.jooq.util.ase.ASEDatabase
+        org.jooq.util.db2.DB2Database
+        org.jooq.util.derby.DerbyDatabase
+        org.jooq.util.h2.H2Database
+        org.jooq.util.hsqldb.HSQLDBDatabase
+        org.jooq.util.ingres.IngresDatabase
+        org.jooq.util.mysql.MySQLDatabase
+        org.jooq.util.oracle.OracleDatabase
+        org.jooq.util.postgres.PostgresDatabase
+        org.jooq.util.sqlite.SQLiteDatabaes
+        org.jooq.util.sqlserver.SQLServerDatabase
+        org.jooq.util.sybase.SybaseDatabase
+
+        You can also provide your own org.jooq.util.Database implementation
+        here, if your database is currently not supported
+        -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!--
+        All elements that are generated from your schema (several Java
+        regular expressions, separated by comma) Watch out for
+        case-sensitivity. Depending on your database, this might be
+        important! You can create case-insensitive regular expressions
+        using this syntax: (?i:expr)A comma-separated list of regular
+        expressions
+        -->
+      <element name="includes" type="string" default=".*" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        All elements that are excluded from your schema (several Java
+        regular expressions, separated by comma). Excludes match before
+        includes
+        -->
+      <element name="excludes" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate java.sql.Timestamp fields for DATE columns. This is
+        particularly useful for Oracle databases
+        -->
+      <element name="dateAsTimestamp" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate jOOU data types for your unsigned data types, which are
+        not natively supported in Java
+        -->
+      <element name="unsignedTypes" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The schema that is used locally as a source for meta information.
+        This could be your development schema or the production schema, etc
+        This cannot be combined with the schemata element.
+        For backwards compatibility, this defaults to jdbc/schema
+        -->
+      <element name="inputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        The schema that is used in generated source code. This will be the
+        production schema. Use this to override your local development
+        schema name for source code generation. If not specified, this
+        will be the same as the input-schema.
+        -->
+      <element name="outputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        A configuration element to configure several input and/or output
+        schemata for jooq-meta, in case you're using jooq-meta in a multi-
+        schema environment
+        -->
+      <element name="schemata" type="tns:Schemata" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure master data table enum classes
+        -->
+      <element name="masterDataTables" type="tns:MasterDataTables" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure custom types introduced to jOOQ
+        using converters
+        This is EXPERIMENTAL functionality. Use at your own risk
+        -->
+      <element name="customTypes" type="tns:CustomTypes" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure synthetic enum types
+        This is EXPERIMENTAL / DEPRECATED functionality. Do not re-use
+        -->
+      <element name="enumTypes" type="tns:EnumTypes" minOccurs="0" maxOccurs="1"/>
+
+      <!--
+        A configuration element to configure type overrides for generated
+        artefacts (e.g. in combination with enumTypes)
+        This is EXPERIMENTAL functionality. Use at your own risk
+        -->
+      <element name="forcedTypes" type="tns:ForcedTypes" minOccurs="0" maxOccurs="1"/>
+    </all>
+  </complexType>
+
+  <complexType name="Schemata">
+    <sequence>
+      <!--
+        A configuration element for a single schema in multi-schema
+        environments
+        -->
+      <element name="schema" type="tns:Schema" minOccurs="1" maxOccurs="unbounded"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="Schema">
+    <all>
+      <!-- See also database/inputSchema -->
+      <element name="inputSchema" type="string" default="" minOccurs="1" maxOccurs="1" />
+
+      <!-- See also database/outputSchema -->
+      <element name="outputSchema" type="string" default="" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="MasterDataTables">
+    <sequence>
+      <!-- A configuration element for a master data table -->
+      <element name="masterDataTable" type="tns:MasterDataTable" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="CustomTypes">
+    <sequence>
+      <!-- A configuration element for a custom type -->
+      <element name="customType" type="tns:CustomType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="EnumTypes">
+    <sequence>
+      <!-- A configuration element for a synthetic enum type -->
+      <element name="enumType" type="tns:EnumType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="ForcedTypes">
+    <sequence>
+      <!-- A configuration element for a forced type override -->
+      <element name="forcedType" type="tns:ForcedType" minOccurs="0" maxOccurs="unbounded" />
+    </sequence>
+  </complexType>
+
+  <complexType name="MasterDataTable">
+    <all>
+      <!-- The name of a master data table -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- The column used for enum literals -->
+      <element name="literal" type="string" minOccurs="0" maxOccurs="1" />
+
+      <!-- The column used for documentation -->
+      <element name="description" type="string" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="CustomType">
+    <all>
+      <!-- The name of the custom type -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- A converter implementation for the custom type -->
+      <element name="converter" type="string" minOccurs="1" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="EnumType">
+    <all>
+      <!-- The name of the synthetic enum type -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!-- A comma separated (CSV format) list of enum literals -->
+      <element name="literals" type="string" minOccurs="1" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="ForcedType">
+    <all>
+      <!-- The name of the type to be forced upon various artefacts -->
+      <element name="name" type="string" minOccurs="1" maxOccurs="1" />
+
+      <!--
+        A comma-separated list of Java regular expressions matching
+        columns, parameters, attributes, etc to be forced to have this
+        type
+        -->
+      <element name="expressions" type="string" minOccurs="1" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Generate">
+    <all>
+      <!--
+        Primary key / foreign key relations should be generated and used.
+        This is a prerequisite for various advanced features
+        -->
+      <element name="relations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate navigation methods to navigate foreign key relationships
+        directly from Record classes. This is only relevant if relations
+        is set to true, too
+        -->
+      <element name="navigationMethods" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!-- Generate deprecated code for backwards compatibility -->
+      <element name="deprecated" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate instance fields in your tables, as opposed to static
+        fields. This simplifies aliasing
+        -->
+      <element name="instanceFields" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate the javax.annotation.Generated annotation to indicate
+        jOOQ version used for source code
+        -->
+      <element name="generatedAnnotation" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate TableRecord classes. Disable this when you don't
+        need the additional type-safety
+        -->
+      <element name="records" type="boolean" default="true" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Generate POJOs in addition to Record classes for usage of the
+        ResultQuery.fetchInto(Class) API
+        -->
+      <element name="pojos" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Annotate POJOs and Records with JPA annotations for increased
+        compatibility and better integration with JPA/Hibernate, etc
+        -->
+      <element name="jpaAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+
+      <!--
+        Annotate POJOs and Records with JSR-303 validation annotations
+        -->
+      <element name="validationAnnotations" type="boolean" default="false" minOccurs="0" maxOccurs="1" />
+    </all>
+  </complexType>
+
+  <complexType name="Target">
+    <all>
+      <!--
+        The destination package of your generated classes (within the
+        destination directory)
+        -->
+      <element name="packageName" type="string" default="org.jooq.generated" minOccurs="0" maxOccurs="1" />
+
+      <!-- The destination directory of your generated classes -->
+      <element name="directory" type="string" default="target/generated-sources/jooq" />
+    </all>
+  </complexType>
+</schema>
\ No newline at end of file
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
index cba23d7414..6929c4bacc 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/oracle/library.xml
@@ -125,6 +125,7 @@
             <generatedAnnotation>false</generatedAnnotation>
             <pojos>true</pojos>
             <jpaAnnotations>true</jpaAnnotations>
+            <validationAnnotations>true</validationAnnotations>
         </generate>
         <target>
             <packageName>org.jooq.test.oracle.generatedclasses</packageName>
diff --git a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/adventureworks.xml b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/adventureworks.xml
index 3f04b776bb..4c0b27119c 100644
--- a/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/adventureworks.xml
+++ b/jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/adventureworks.xml
@@ -46,6 +46,7 @@
             <generatedAnnotation>false</generatedAnnotation>
             <pojos>true</pojos>
             <jpaAnnotations>true</jpaAnnotations>
+            <validationAnnotations>true</validationAnnotations>
         </generate>
         <target>
             <packageName>org.jooq.examples.sqlserver.adventureworks</packageName>
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/AWBuildVersion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/AWBuildVersion.java
index c09a5dc4ce..211c1ec9d5 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/AWBuildVersion.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/AWBuildVersion.java
@@ -10,11 +10,20 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.tables.pojos;
 @javax.persistence.Table(name = "AWBuildVersion", schema = "dbo")
 public class AWBuildVersion implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1171551211;
+	private static final long serialVersionUID = -1115064087;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     SystemInformationID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String   Database_Version;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp VersionDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/DatabaseLog.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/DatabaseLog.java
index 6beb03bf9c..7b18e70973 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/DatabaseLog.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/DatabaseLog.java
@@ -10,15 +10,33 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.tables.pojos;
 @javax.persistence.Table(name = "DatabaseLog", schema = "dbo")
 public class DatabaseLog implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1010482335;
+	private static final long serialVersionUID = 491667655;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  DatabaseLogID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp PostTime;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   DatabaseUser;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   Event;
+
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   Schema;
+
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   Object;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   TSQL;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Object   XmlEvent;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/ErrorLog.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/ErrorLog.java
index 071183eedf..97d796d313 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/ErrorLog.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/pojos/ErrorLog.java
@@ -10,16 +10,30 @@ package org.jooq.examples.sqlserver.adventureworks.dbo.tables.pojos;
 @javax.persistence.Table(name = "ErrorLog", schema = "dbo")
 public class ErrorLog implements java.io.Serializable {
 
-	private static final long serialVersionUID = 968553243;
+	private static final long serialVersionUID = -1759188406;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ErrorLogID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ErrorTime;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   UserName;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ErrorNumber;
 	private java.lang.Integer  ErrorSeverity;
 	private java.lang.Integer  ErrorState;
+
+	@javax.validation.constraints.Size(max = 126)
 	private java.lang.String   ErrorProcedure;
 	private java.lang.Integer  ErrorLine;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 4000)
 	private java.lang.String   ErrorMessage;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Department.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Department.java
index 42960a8cbb..01fb7d355c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Department.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Department.java
@@ -10,11 +10,21 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "Department", schema = "HumanResources")
 public class Department implements java.io.Serializable {
 
-	private static final long serialVersionUID = 874413959;
+	private static final long serialVersionUID = 1092392183;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    DepartmentID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   GroupName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Employee.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Employee.java
index 1b4aee530f..109090914e 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Employee.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Employee.java
@@ -10,23 +10,58 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "Employee", schema = "HumanResources")
 public class Employee implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1424024593;
+	private static final long serialVersionUID = -248178844;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String   NationalIDNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   LoginID;
 	private java.lang.Integer  ManagerID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Title;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp BirthDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String   MaritalStatus;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String   Gender;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp HireDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  SalariedFlag;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    VacationHours;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    SickLeaveHours;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  CurrentFlag;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeAddress.java
index d2e8759fbd..50c6816482 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeAddress.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeAddress.java
@@ -12,11 +12,19 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 })
 public class EmployeeAddress implements java.io.Serializable {
 
-	private static final long serialVersionUID = 172531843;
+	private static final long serialVersionUID = -738247733;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "EmployeeID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeDepartmentHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeDepartmentHistory.java
index a58425b0fd..657cb7b5dc 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeDepartmentHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeeDepartmentHistory.java
@@ -12,13 +12,23 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 })
 public class EmployeeDepartmentHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -577466492;
+	private static final long serialVersionUID = -1705895832;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    DepartmentID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     ShiftID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartDate;
 	private java.sql.Timestamp EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "EmployeeID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeePayHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeePayHistory.java
index 4127d22f1e..a8cb3dd451 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeePayHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/EmployeePayHistory.java
@@ -12,12 +12,22 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 })
 public class EmployeePayHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -385008108;
+	private static final long serialVersionUID = -2010601952;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    EmployeeID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   RateChangeDate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal Rate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       PayFrequency;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "EmployeeID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/JobCandidate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/JobCandidate.java
index e48b28405c..ea2d8f868c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/JobCandidate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/JobCandidate.java
@@ -10,11 +10,15 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "JobCandidate", schema = "HumanResources")
 public class JobCandidate implements java.io.Serializable {
 
-	private static final long serialVersionUID = 273639540;
+	private static final long serialVersionUID = -528582852;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  JobCandidateID;
 	private java.lang.Integer  EmployeeID;
 	private java.lang.Object   Resume;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Shift.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Shift.java
index eb033dae77..8657df2c73 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Shift.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/Shift.java
@@ -10,12 +10,23 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "Shift", schema = "HumanResources")
 public class Shift implements java.io.Serializable {
 
-	private static final long serialVersionUID = 579370660;
+	private static final long serialVersionUID = -834624948;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     ShiftID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartTime;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp EndTime;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployee.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployee.java
index da538888fc..10e838cd06 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployee.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployee.java
@@ -10,23 +10,63 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vEmployee", schema = "HumanResources")
 public class vEmployee implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1048994626;
+	private static final long serialVersionUID = -1187822110;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer EmployeeID;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String  Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String  Suffix;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  JobTitle;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String  Phone;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer EmailPromotion;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String  City;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  StateProvinceName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String  PostalCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  CountryRegionName;
 	private java.lang.Object  AdditionalContactInfo;
 
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartment.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartment.java
index d2af7c1a2a..f0456b00d8 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartment.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartment.java
@@ -10,17 +10,42 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vEmployeeDepartment", schema = "HumanResources")
 public class vEmployeeDepartment implements java.io.Serializable {
 
-	private static final long serialVersionUID = 659488298;
+	private static final long serialVersionUID = -1921083959;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String   Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   Suffix;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   JobTitle;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Department;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   GroupName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartDate;
 
 	@javax.persistence.Column(name = "EmployeeID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartmentHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartmentHistory.java
index 0ec6afed3d..ea96e15aeb 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartmentHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vEmployeeDepartmentHistory.java
@@ -10,17 +10,42 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vEmployeeDepartmentHistory", schema = "HumanResources")
 public class vEmployeeDepartmentHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -486436159;
+	private static final long serialVersionUID = 51411690;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String   Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   Suffix;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Shift;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Department;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   GroupName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartDate;
 	private java.sql.Timestamp EndDate;
 
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidate.java
index 309616d88d..98e2c49171 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidate.java
@@ -10,23 +10,47 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vJobCandidate", schema = "HumanResources")
 public class vJobCandidate implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1307250023;
+	private static final long serialVersionUID = -317266702;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  JobCandidateID;
 	private java.lang.Integer  EmployeeID;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Name_Prefix;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Name_First;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Name_Middle;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Name_Last;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Name_Suffix;
 	private java.lang.String   Skills;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Addr_Type;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Addr_Loc_CountryRegion;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Addr_Loc_State;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Addr_Loc_City;
+
+	@javax.validation.constraints.Size(max = 20)
 	private java.lang.String   Addr_PostalCode;
 	private java.lang.String   EMail;
 	private java.lang.String   WebSite;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "JobCandidateID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEducation.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEducation.java
index b6dcb05192..2394a16498 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEducation.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEducation.java
@@ -10,20 +10,40 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vJobCandidateEducation", schema = "HumanResources")
 public class vJobCandidateEducation implements java.io.Serializable {
 
-	private static final long serialVersionUID = 54483795;
+	private static final long serialVersionUID = -1509666969;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  JobCandidateID;
 	private java.lang.String   Edu_Level;
 	private java.sql.Timestamp Edu_StartDate;
 	private java.sql.Timestamp Edu_EndDate;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Edu_Degree;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Edu_Major;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Edu_Minor;
+
+	@javax.validation.constraints.Size(max = 5)
 	private java.lang.String   Edu_GPA;
+
+	@javax.validation.constraints.Size(max = 5)
 	private java.lang.String   Edu_GPAScale;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Edu_School;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Edu_Loc_CountryRegion;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Edu_Loc_State;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Edu_Loc_City;
 
 	@javax.persistence.Column(name = "JobCandidateID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEmployment.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEmployment.java
index 6a68734ca9..45e11edddd 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEmployment.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/pojos/vJobCandidateEmployment.java
@@ -10,12 +10,18 @@ package org.jooq.examples.sqlserver.adventureworks.humanresources.tables.pojos;
 @javax.persistence.Table(name = "vJobCandidateEmployment", schema = "HumanResources")
 public class vJobCandidateEmployment implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1612702651;
+	private static final long serialVersionUID = -616425385;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  JobCandidateID;
 	private java.sql.Timestamp Emp_StartDate;
 	private java.sql.Timestamp Emp_EndDate;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Emp_OrgName;
+
+	@javax.validation.constraints.Size(max = 100)
 	private java.lang.String   Emp_JobTitle;
 	private java.lang.String   Emp_Responsibility;
 	private java.lang.String   Emp_FunctionCategory;
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Address.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Address.java
index a43a66bf73..cd33800af6 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Address.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Address.java
@@ -10,15 +10,34 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "Address", schema = "Person")
 public class Address implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1004944940;
+	private static final long serialVersionUID = -570435411;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String   AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String   AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   City;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  StateProvinceID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String   PostalCode;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/AddressType.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/AddressType.java
index 0af64a345c..b4a8cc9136 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/AddressType.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/AddressType.java
@@ -10,11 +10,20 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "AddressType", schema = "Person")
 public class AddressType implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1445238841;
+	private static final long serialVersionUID = -1662377973;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressTypeID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contact.java
index 20b045f65a..79ab546ea9 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contact.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/Contact.java
@@ -10,22 +10,54 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "Contact", schema = "Person")
 public class Contact implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1592993605;
+	private static final long serialVersionUID = -1460173084;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  NameStyle;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String   Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   Suffix;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  EmailPromotion;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String   Phone;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   PasswordHash;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   PasswordSalt;
 	private java.lang.Object   AdditionalContactInfo;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/ContactType.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/ContactType.java
index 23be68848d..b6e479458f 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/ContactType.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/ContactType.java
@@ -10,10 +10,17 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "ContactType", schema = "Person")
 public class ContactType implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1778831552;
+	private static final long serialVersionUID = -1918311400;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactTypeID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/CountryRegion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/CountryRegion.java
index a9b84f3c1e..3ce2922be2 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/CountryRegion.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/CountryRegion.java
@@ -10,10 +10,18 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "CountryRegion", schema = "Person")
 public class CountryRegion implements java.io.Serializable {
 
-	private static final long serialVersionUID = -126439025;
+	private static final long serialVersionUID = -266318987;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   CountryRegionCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/StateProvince.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/StateProvince.java
index f00b5e576e..01b69f6470 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/StateProvince.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/StateProvince.java
@@ -10,15 +10,34 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "StateProvince", schema = "Person")
 public class StateProvince implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1934281339;
+	private static final long serialVersionUID = 1403302575;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  StateProvinceID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   StateProvinceCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   CountryRegionCode;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  IsOnlyStateProvinceFlag;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  TerritoryID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vAdditionalContactInfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vAdditionalContactInfo.java
index ecb3e57d37..f2d8cc07cb 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vAdditionalContactInfo.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vAdditionalContactInfo.java
@@ -10,24 +10,54 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "vAdditionalContactInfo", schema = "Person")
 public class vAdditionalContactInfo implements java.io.Serializable {
 
-	private static final long serialVersionUID = -501133403;
+	private static final long serialVersionUID = 192387103;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   LastName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   TelephoneNumber;
 	private java.lang.String   TelephoneSpecialInstructions;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Street;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   City;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   StateProvince;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   PostalCode;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   CountryRegion;
 	private java.lang.String   HomeAddressSpecialInstructions;
+
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String   EMailAddress;
 	private java.lang.String   EMailSpecialInstructions;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   EMailTelephoneNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ContactID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vStateProvinceCountryRegion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vStateProvinceCountryRegion.java
index cc4d7b30d8..f76d1e238b 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vStateProvinceCountryRegion.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/pojos/vStateProvinceCountryRegion.java
@@ -10,14 +10,32 @@ package org.jooq.examples.sqlserver.adventureworks.person.tables.pojos;
 @javax.persistence.Table(name = "vStateProvinceCountryRegion", schema = "Person")
 public class vStateProvinceCountryRegion implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1320861080;
+	private static final long serialVersionUID = -1972845704;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer StateProvinceID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String  StateProvinceCode;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean IsOnlyStateProvinceFlag;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  StateProvinceName;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer TerritoryID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String  CountryRegionCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  CountryRegionName;
 
 	@javax.persistence.Column(name = "StateProvinceID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/BillOfMaterials.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/BillOfMaterials.java
index b6822b9e11..8dada6df34 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/BillOfMaterials.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/BillOfMaterials.java
@@ -10,16 +10,31 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "BillOfMaterials", schema = "Production")
 public class BillOfMaterials implements java.io.Serializable {
 
-	private static final long serialVersionUID = -473207663;
+	private static final long serialVersionUID = 1142573717;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    BillOfMaterialsID;
 	private java.lang.Integer    ProductAssemblyID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ComponentID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   StartDate;
 	private java.sql.Timestamp   EndDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     UnitMeasureCode;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      BOMLevel;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal PerAssemblyQty;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Culture.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Culture.java
index 13046536e8..639b4c50ec 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Culture.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Culture.java
@@ -10,10 +10,18 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "Culture", schema = "Production")
 public class Culture implements java.io.Serializable {
 
-	private static final long serialVersionUID = -265854520;
+	private static final long serialVersionUID = -2037209663;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 6)
 	private java.lang.String   CultureID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Document.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Document.java
index d68141e4de..f70097ba3c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Document.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Document.java
@@ -10,17 +10,37 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "Document", schema = "Production")
 public class Document implements java.io.Serializable {
 
-	private static final long serialVersionUID = 24435218;
+	private static final long serialVersionUID = -618458402;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  DocumentID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String   FileName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String   FileExtension;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 5)
 	private java.lang.String   Revision;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ChangeNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     Status;
 	private java.lang.String   DocumentSummary;
 	private byte[]             Document;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Illustration.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Illustration.java
index 5ca7b20b45..257fd9a25c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Illustration.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Illustration.java
@@ -10,10 +10,14 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "Illustration", schema = "Production")
 public class Illustration implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1841215469;
+	private static final long serialVersionUID = -302138989;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  IllustrationID;
 	private java.lang.Object   Diagram;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Location.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Location.java
index 7bf427a709..8f91ed7705 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Location.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Location.java
@@ -10,12 +10,23 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "Location", schema = "Production")
 public class Location implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1439113007;
+	private static final long serialVersionUID = 1732773159;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      LocationID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal CostRate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal Availability;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Product.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Product.java
index 2b682fe13a..3b1a546c39 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Product.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/Product.java
@@ -10,32 +10,74 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "Product", schema = "Production")
 public class Product implements java.io.Serializable {
 
-	private static final long serialVersionUID = -313725846;
+	private static final long serialVersionUID = -1226806630;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     ProductNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean    MakeFlag;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean    FinishedGoodsFlag;
+
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String     Color;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      SafetyStockLevel;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      ReorderPoint;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal StandardCost;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ListPrice;
+
+	@javax.validation.constraints.Size(max = 5)
 	private java.lang.String     Size;
+
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     SizeUnitMeasureCode;
+
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     WeightUnitMeasureCode;
 	private java.math.BigDecimal Weight;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    DaysToManufacture;
+
+	@javax.validation.constraints.Size(max = 2)
 	private java.lang.String     ProductLine;
+
+	@javax.validation.constraints.Size(max = 2)
 	private java.lang.String     Class;
+
+	@javax.validation.constraints.Size(max = 2)
 	private java.lang.String     Style;
 	private java.lang.Integer    ProductSubcategoryID;
 	private java.lang.Integer    ProductModelID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   SellStartDate;
 	private java.sql.Timestamp   SellEndDate;
 	private java.sql.Timestamp   DiscontinuedDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCategory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCategory.java
index 747bde1c91..fc8acaebba 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCategory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCategory.java
@@ -10,11 +10,20 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductCategory", schema = "Production")
 public class ProductCategory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 81325731;
+	private static final long serialVersionUID = 1563926311;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductCategoryID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCostHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCostHistory.java
index 6451bbfcfa..3198aefde3 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCostHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductCostHistory.java
@@ -12,12 +12,20 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductCostHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -907559410;
+	private static final long serialVersionUID = 1675834310;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   StartDate;
 	private java.sql.Timestamp   EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal StandardCost;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDescription.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDescription.java
index 1da5b878b1..93916849f6 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDescription.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDescription.java
@@ -10,11 +10,20 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductDescription", schema = "Production")
 public class ProductDescription implements java.io.Serializable {
 
-	private static final long serialVersionUID = -496678554;
+	private static final long serialVersionUID = -1402106589;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductDescriptionID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String   Description;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDocument.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDocument.java
index 17a8328ee6..df0aec4f57 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDocument.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductDocument.java
@@ -12,10 +12,16 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductDocument implements java.io.Serializable {
 
-	private static final long serialVersionUID = -920710150;
+	private static final long serialVersionUID = -510662050;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  DocumentID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductInventory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductInventory.java
index 039134d104..d8f47e78d6 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductInventory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductInventory.java
@@ -12,14 +12,29 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductInventory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1132131414;
+	private static final long serialVersionUID = 1935041794;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    LocationID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   Shelf;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     Bin;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    Quantity;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductListPriceHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductListPriceHistory.java
index b570d2ec0d..21f76c1693 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductListPriceHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductListPriceHistory.java
@@ -12,12 +12,20 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductListPriceHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1785389324;
+	private static final long serialVersionUID = 405262580;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   StartDate;
 	private java.sql.Timestamp   EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ListPrice;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModel.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModel.java
index 3f2b428462..7e4c17cdb7 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModel.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModel.java
@@ -10,13 +10,22 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductModel", schema = "Production")
 public class ProductModel implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1304203417;
+	private static final long serialVersionUID = 1941057933;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductModelID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
 	private java.lang.Object   CatalogDescription;
 	private java.lang.Object   Instructions;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelIllustration.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelIllustration.java
index d7bab973c5..c407bbb51a 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelIllustration.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelIllustration.java
@@ -12,10 +12,16 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductModelIllustration implements java.io.Serializable {
 
-	private static final long serialVersionUID = -966554540;
+	private static final long serialVersionUID = -1461132504;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductModelID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  IllustrationID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductModelID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelProductDescriptionCulture.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelProductDescriptionCulture.java
index 33c623666e..09673bcaf8 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelProductDescriptionCulture.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductModelProductDescriptionCulture.java
@@ -12,11 +12,20 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductModelProductDescriptionCulture implements java.io.Serializable {
 
-	private static final long serialVersionUID = 847230316;
+	private static final long serialVersionUID = -1674497077;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductModelID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductDescriptionID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 6)
 	private java.lang.String   CultureID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductModelID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductPhoto.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductPhoto.java
index 202709ab69..8348f7ef21 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductPhoto.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductPhoto.java
@@ -10,13 +10,21 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductPhoto", schema = "Production")
 public class ProductPhoto implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1387322169;
+	private static final long serialVersionUID = -438305887;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductPhotoID;
 	private byte[]             ThumbNailPhoto;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   ThumbnailPhotoFileName;
 	private byte[]             LargePhoto;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   LargePhotoFileName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductProductPhoto.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductProductPhoto.java
index 63d46880fc..53626767e6 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductProductPhoto.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductProductPhoto.java
@@ -12,11 +12,19 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class ProductProductPhoto implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1334733080;
+	private static final long serialVersionUID = 222277608;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductPhotoID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  Primary;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductReview.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductReview.java
index 55a8ea6f81..1654bd0a94 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductReview.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductReview.java
@@ -10,15 +10,33 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductReview", schema = "Production")
 public class ProductReview implements java.io.Serializable {
 
-	private static final long serialVersionUID = -623037092;
+	private static final long serialVersionUID = 231016953;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductReviewID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   ReviewerName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ReviewDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  Rating;
+
+	@javax.validation.constraints.Size(max = 3850)
 	private java.lang.String   Comments;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductSubcategory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductSubcategory.java
index 7743c4a5d8..536c8da81d 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductSubcategory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ProductSubcategory.java
@@ -10,12 +10,23 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ProductSubcategory", schema = "Production")
 public class ProductSubcategory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 160779153;
+	private static final long serialVersionUID = 1508635313;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductSubcategoryID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductCategoryID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ScrapReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ScrapReason.java
index 8427ce242f..5a91f1e05e 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ScrapReason.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/ScrapReason.java
@@ -10,10 +10,17 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "ScrapReason", schema = "Production")
 public class ScrapReason implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1755825898;
+	private static final long serialVersionUID = -763961518;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    ScrapReasonID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistory.java
index a6922b11ba..3b975271e3 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistory.java
@@ -10,16 +10,35 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "TransactionHistory", schema = "Production")
 public class TransactionHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 148292007;
+	private static final long serialVersionUID = 650647639;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    TransactionID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ReferenceOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ReferenceOrderLineID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   TransactionDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String     TransactionType;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    Quantity;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ActualCost;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistoryArchive.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistoryArchive.java
index 4585002085..2b5fb246da 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistoryArchive.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/TransactionHistoryArchive.java
@@ -10,16 +10,35 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "TransactionHistoryArchive", schema = "Production")
 public class TransactionHistoryArchive implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2072643205;
+	private static final long serialVersionUID = -352400839;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    TransactionID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ReferenceOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ReferenceOrderLineID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   TransactionDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String     TransactionType;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    Quantity;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ActualCost;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/UnitMeasure.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/UnitMeasure.java
index 1888bfd165..744b1b8b7e 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/UnitMeasure.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/UnitMeasure.java
@@ -10,10 +10,18 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "UnitMeasure", schema = "Production")
 public class UnitMeasure implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2039920527;
+	private static final long serialVersionUID = 1491172149;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   UnitMeasureCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrder.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrder.java
index d8d4d76db6..a5dfd1b5a6 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrder.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrder.java
@@ -10,17 +10,33 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "WorkOrder", schema = "Production")
 public class WorkOrder implements java.io.Serializable {
 
-	private static final long serialVersionUID = -881616029;
+	private static final long serialVersionUID = -2064628893;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  WorkOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  OrderQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  StockedQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    ScrappedQty;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartDate;
 	private java.sql.Timestamp EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp DueDate;
 	private java.lang.Short    ScrapReasonID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrderRouting.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrderRouting.java
index d9253e83db..167ef93c99 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrderRouting.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/WorkOrderRouting.java
@@ -12,19 +12,35 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 })
 public class WorkOrderRouting implements java.io.Serializable {
 
-	private static final long serialVersionUID = 374057530;
+	private static final long serialVersionUID = 1007133682;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    WorkOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      OperationSequence;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      LocationID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ScheduledStartDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ScheduledEndDate;
 	private java.sql.Timestamp   ActualStartDate;
 	private java.sql.Timestamp   ActualEndDate;
 	private java.math.BigDecimal ActualResourceHrs;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal PlannedCost;
 	private java.math.BigDecimal ActualCost;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "WorkOrderID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductAndDescription.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductAndDescription.java
index 7ea383c834..0bddf9ebde 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductAndDescription.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductAndDescription.java
@@ -10,12 +10,26 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "vProductAndDescription", schema = "Production")
 public class vProductAndDescription implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1939233424;
+	private static final long serialVersionUID = -728392136;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer ProductID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  ProductModel;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 6)
 	private java.lang.String  CultureID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String  Description;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelCatalogDescription.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelCatalogDescription.java
index 5cbec7564c..eb1a0af394 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelCatalogDescription.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelCatalogDescription.java
@@ -10,32 +10,77 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "vProductModelCatalogDescription", schema = "Production")
 public class vProductModelCatalogDescription implements java.io.Serializable {
 
-	private static final long serialVersionUID = -143861014;
+	private static final long serialVersionUID = -1326099174;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductModelID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
 	private java.lang.String   Summary;
 	private java.lang.String   Manufacturer;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String   Copyright;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   ProductURL;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   WarrantyPeriod;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   WarrantyDescription;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   NoOfYears;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   MaintenanceDescription;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Wheel;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Saddle;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Pedal;
 	private java.lang.String   BikeFrame;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Crankset;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   PictureAngle;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   PictureSize;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   ProductPhotoID;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Material;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Color;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   ProductLine;
+
+	@javax.validation.constraints.Size(max = 256)
 	private java.lang.String   Style;
+
+	@javax.validation.constraints.Size(max = 1024)
 	private java.lang.String   RiderExperience;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductModelID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelInstructions.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelInstructions.java
index 305fbc3c41..87bb3f4cce 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelInstructions.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/pojos/vProductModelInstructions.java
@@ -10,9 +10,14 @@ package org.jooq.examples.sqlserver.adventureworks.production.tables.pojos;
 @javax.persistence.Table(name = "vProductModelInstructions", schema = "Production")
 public class vProductModelInstructions implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2019298195;
+	private static final long serialVersionUID = 262551119;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductModelID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
 	private java.lang.String     Instructions;
 	private java.lang.Integer    LocationID;
@@ -20,8 +25,14 @@ public class vProductModelInstructions implements java.io.Serializable {
 	private java.math.BigDecimal MachineHours;
 	private java.math.BigDecimal LaborHours;
 	private java.lang.Integer    LotSize;
+
+	@javax.validation.constraints.Size(max = 1024)
 	private java.lang.String     Step;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductModelID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ProductVendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ProductVendor.java
index 8a24abb6a2..1d425505d7 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ProductVendor.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ProductVendor.java
@@ -12,18 +12,35 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 })
 public class ProductVendor implements java.io.Serializable {
 
-	private static final long serialVersionUID = 661921819;
+	private static final long serialVersionUID = 239163359;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    VendorID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    AverageLeadTime;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal StandardPrice;
 	private java.math.BigDecimal LastReceiptCost;
 	private java.sql.Timestamp   LastReceiptDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    MinOrderQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    MaxOrderQty;
 	private java.lang.Integer    OnOrderQty;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     UnitMeasureCode;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "ProductID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderDetail.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderDetail.java
index 7ccc67440c..100c991af1 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderDetail.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderDetail.java
@@ -12,18 +12,40 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 })
 public class PurchaseOrderDetail implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1280380481;
+	private static final long serialVersionUID = 1613800357;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    PurchaseOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    PurchaseOrderDetailID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   DueDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      OrderQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal UnitPrice;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal LineTotal;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ReceivedQty;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal RejectedQty;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal StockedQty;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "PurchaseOrderID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderHeader.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderHeader.java
index d1fb656a12..6e71daeea9 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderHeader.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/PurchaseOrderHeader.java
@@ -10,20 +10,44 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 @javax.persistence.Table(name = "PurchaseOrderHeader", schema = "Purchasing")
 public class PurchaseOrderHeader implements java.io.Serializable {
 
-	private static final long serialVersionUID = -2088262516;
+	private static final long serialVersionUID = 273356572;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    PurchaseOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       RevisionNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       Status;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    EmployeeID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    VendorID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ShipMethodID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   OrderDate;
 	private java.sql.Timestamp   ShipDate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SubTotal;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal TaxAmt;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal Freight;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal TotalDue;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ShipMethod.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ShipMethod.java
index d376d81b99..1e79890307 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ShipMethod.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/ShipMethod.java
@@ -10,13 +10,26 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 @javax.persistence.Table(name = "ShipMethod", schema = "Purchasing")
 public class ShipMethod implements java.io.Serializable {
 
-	private static final long serialVersionUID = -2114878671;
+	private static final long serialVersionUID = -35270371;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ShipMethodID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ShipBase;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal ShipRate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/Vendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/Vendor.java
index 7fa2d4d800..4bd840bfbd 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/Vendor.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/Vendor.java
@@ -10,15 +10,33 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 @javax.persistence.Table(name = "Vendor", schema = "Purchasing")
 public class Vendor implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2008437684;
+	private static final long serialVersionUID = 1216883967;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  VendorID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String   AccountNumber;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     CreditRating;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  PreferredVendorStatus;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean  ActiveFlag;
+
+	@javax.validation.constraints.Size(max = 1024)
 	private java.lang.String   PurchasingWebServiceURL;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorAddress.java
index 486ab549f0..0a2fe0657e 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorAddress.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorAddress.java
@@ -12,11 +12,19 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 })
 public class VendorAddress implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1899358278;
+	private static final long serialVersionUID = -696634738;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  VendorID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressTypeID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "VendorID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorContact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorContact.java
index 69c9771008..c1069d46a0 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorContact.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/VendorContact.java
@@ -12,11 +12,19 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 })
 public class VendorContact implements java.io.Serializable {
 
-	private static final long serialVersionUID = 581214586;
+	private static final long serialVersionUID = 38016962;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  VendorID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactTypeID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "VendorID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/vVendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/vVendor.java
index 8c7b6739c0..86fcddd57b 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/vVendor.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/pojos/vVendor.java
@@ -10,24 +10,67 @@ package org.jooq.examples.sqlserver.adventureworks.purchasing.tables.pojos;
 @javax.persistence.Table(name = "vVendor", schema = "Purchasing")
 public class vVendor implements java.io.Serializable {
 
-	private static final long serialVersionUID = -583488567;
+	private static final long serialVersionUID = 1065079395;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer VendorID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  ContactType;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String  Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String  Suffix;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String  Phone;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer EmailPromotion;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String  City;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  StateProvinceName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String  PostalCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  CountryRegionName;
 
 	@javax.persistence.Column(name = "VendorID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ContactCreditCard.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ContactCreditCard.java
index ff734e7d90..375801df04 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ContactCreditCard.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ContactCreditCard.java
@@ -12,10 +12,16 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class ContactCreditCard implements java.io.Serializable {
 
-	private static final long serialVersionUID = 532311005;
+	private static final long serialVersionUID = -778601407;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CreditCardID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "ContactID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CountryRegionCurrency.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CountryRegionCurrency.java
index 3ad8d437b3..e534170c91 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CountryRegionCurrency.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CountryRegionCurrency.java
@@ -12,10 +12,18 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class CountryRegionCurrency implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1163629495;
+	private static final long serialVersionUID = -975293463;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   CountryRegionCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   CurrencyCode;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "CountryRegionCode", nullable = false, length = 3)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CreditCard.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CreditCard.java
index 905cd2724a..2fda827dbf 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CreditCard.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CreditCard.java
@@ -10,13 +10,27 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "CreditCard", schema = "Sales")
 public class CreditCard implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1337536643;
+	private static final long serialVersionUID = -1718095677;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CreditCardID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   CardType;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String   CardNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte     ExpMonth;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short    ExpYear;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Currency.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Currency.java
index 7e3fee0c7d..7674d05510 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Currency.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Currency.java
@@ -10,10 +10,18 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "Currency", schema = "Sales")
 public class Currency implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1428602621;
+	private static final long serialVersionUID = 207164409;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String   CurrencyCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CurrencyRate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CurrencyRate.java
index 92488c771a..c47296b57f 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CurrencyRate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CurrencyRate.java
@@ -10,14 +10,30 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "CurrencyRate", schema = "Sales")
 public class CurrencyRate implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2043091641;
+	private static final long serialVersionUID = 992562925;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    CurrencyRateID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   CurrencyRateDate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     FromCurrencyCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     ToCurrencyCode;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal AverageRate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal EndOfDayRate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Customer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Customer.java
index 2525bc4129..76c8c2f010 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Customer.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Customer.java
@@ -10,13 +10,25 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "Customer", schema = "Sales")
 public class Customer implements java.io.Serializable {
 
-	private static final long serialVersionUID = 372374611;
+	private static final long serialVersionUID = -1257221465;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CustomerID;
 	private java.lang.Integer  TerritoryID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String   AccountNumber;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String   CustomerType;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CustomerAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CustomerAddress.java
index 2259c5cba5..4d26179f0a 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CustomerAddress.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/CustomerAddress.java
@@ -12,12 +12,22 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class CustomerAddress implements java.io.Serializable {
 
-	private static final long serialVersionUID = 792514133;
+	private static final long serialVersionUID = 710794481;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CustomerID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  AddressTypeID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "CustomerID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Individual.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Individual.java
index 8c960b6c8d..be013edc08 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Individual.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Individual.java
@@ -10,11 +10,17 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "Individual", schema = "Sales")
 public class Individual implements java.io.Serializable {
 
-	private static final long serialVersionUID = -474462809;
+	private static final long serialVersionUID = 1901488907;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CustomerID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
 	private java.lang.Object   Demographics;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderDetail.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderDetail.java
index dbc42b3cd1..643e707562 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderDetail.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderDetail.java
@@ -12,18 +12,40 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class SalesOrderDetail implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1359151138;
+	private static final long serialVersionUID = 155321158;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesOrderDetailID;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     CarrierTrackingNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Short      OrderQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SpecialOfferID;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal UnitPrice;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal UnitPriceDiscount;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal LineTotal;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "SalesOrderID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeader.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeader.java
index 4c640395d3..bf9a570da4 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeader.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeader.java
@@ -10,34 +10,79 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SalesOrderHeader", schema = "Sales")
 public class SalesOrderHeader implements java.io.Serializable {
 
-	private static final long serialVersionUID = -78270942;
+	private static final long serialVersionUID = 506206376;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       RevisionNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   OrderDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   DueDate;
 	private java.sql.Timestamp   ShipDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       Status;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Boolean    OnlineOrderFlag;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     SalesOrderNumber;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     PurchaseOrderNumber;
+
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String     AccountNumber;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    CustomerID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ContactID;
 	private java.lang.Integer    SalesPersonID;
 	private java.lang.Integer    TerritoryID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    BillToAddressID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ShipToAddressID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    ShipMethodID;
 	private java.lang.Integer    CreditCardID;
+
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String     CreditCardApprovalCode;
 	private java.lang.Integer    CurrencyRateID;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SubTotal;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal TaxAmt;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal Freight;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal TotalDue;
+
+	@javax.validation.constraints.Size(max = 128)
 	private java.lang.String     Comment;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeaderSalesReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeaderSalesReason.java
index d6564a6f60..5d54a32228 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeaderSalesReason.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesOrderHeaderSalesReason.java
@@ -12,10 +12,16 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class SalesOrderHeaderSalesReason implements java.io.Serializable {
 
-	private static final long serialVersionUID = 335162224;
+	private static final long serialVersionUID = 1847006348;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  SalesOrderID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  SalesReasonID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "SalesOrderID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPerson.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPerson.java
index 92d33d4b29..244396b644 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPerson.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPerson.java
@@ -10,16 +10,30 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SalesPerson", schema = "Sales")
 public class SalesPerson implements java.io.Serializable {
 
-	private static final long serialVersionUID = 147609774;
+	private static final long serialVersionUID = 632680538;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesPersonID;
 	private java.lang.Integer    TerritoryID;
 	private java.math.BigDecimal SalesQuota;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal Bonus;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal CommissionPct;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesYTD;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesLastYear;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPersonQuotaHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPersonQuotaHistory.java
index a4099427c6..2d3c022458 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPersonQuotaHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesPersonQuotaHistory.java
@@ -12,12 +12,22 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class SalesPersonQuotaHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1504379402;
+	private static final long serialVersionUID = -1983278354;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesPersonID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   QuotaDate;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesQuota;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Column(name = "SalesPersonID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesReason.java
index 51c940ca0f..2492d73dbb 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesReason.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesReason.java
@@ -10,11 +10,21 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SalesReason", schema = "Sales")
 public class SalesReason implements java.io.Serializable {
 
-	private static final long serialVersionUID = -378272363;
+	private static final long serialVersionUID = -1506155259;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  SalesReasonID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   ReasonType;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTaxRate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTaxRate.java
index 293f2471e0..0ac25bd18c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTaxRate.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTaxRate.java
@@ -10,14 +10,29 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SalesTaxRate", schema = "Sales")
 public class SalesTaxRate implements java.io.Serializable {
 
-	private static final long serialVersionUID = 14238155;
+	private static final long serialVersionUID = -1338896213;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesTaxRateID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    StateProvinceID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Byte       TaxType;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal TaxRate;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritory.java
index 6f34e53722..d7cda68dae 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritory.java
@@ -10,17 +10,40 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SalesTerritory", schema = "Sales")
 public class SalesTerritory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1629221517;
+	private static final long serialVersionUID = 1547924707;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    TerritoryID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 3)
 	private java.lang.String     CountryRegionCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Group;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesYTD;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesLastYear;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal CostYTD;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal CostLastYear;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritoryHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritoryHistory.java
index 56d1f4e094..a13e76d1be 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritoryHistory.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SalesTerritoryHistory.java
@@ -12,13 +12,23 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class SalesTerritoryHistory implements java.io.Serializable {
 
-	private static final long serialVersionUID = -932464019;
+	private static final long serialVersionUID = -591093167;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  SalesPersonID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  TerritoryID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp StartDate;
 	private java.sql.Timestamp EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "SalesPersonID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ShoppingCartItem.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ShoppingCartItem.java
index e4ab6ef971..a2e3a8223c 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ShoppingCartItem.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/ShoppingCartItem.java
@@ -10,13 +10,26 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "ShoppingCartItem", schema = "Sales")
 public class ShoppingCartItem implements java.io.Serializable {
 
-	private static final long serialVersionUID = 966402692;
+	private static final long serialVersionUID = -165886736;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ShoppingCartItemID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   ShoppingCartID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  Quantity;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp DateCreated;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOffer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOffer.java
index e25790cba3..cd5c12ac90 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOffer.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOffer.java
@@ -10,18 +10,41 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "SpecialOffer", schema = "Sales")
 public class SpecialOffer implements java.io.Serializable {
 
-	private static final long serialVersionUID = 542108653;
+	private static final long serialVersionUID = -1153889176;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SpecialOfferID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 255)
 	private java.lang.String     Description;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal DiscountPct;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Type;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Category;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   StartDate;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   EndDate;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    MinQty;
 	private java.lang.Integer    MaxQty;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String     rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp   ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOfferProduct.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOfferProduct.java
index a713cf8aac..f345cc9319 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOfferProduct.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/SpecialOfferProduct.java
@@ -12,11 +12,19 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class SpecialOfferProduct implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1838956005;
+	private static final long serialVersionUID = 448746083;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  SpecialOfferID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ProductID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "SpecialOfferID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Store.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Store.java
index dc424df600..3e428a4dc7 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Store.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/Store.java
@@ -10,13 +10,22 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "Store", schema = "Sales")
 public class Store implements java.io.Serializable {
 
-	private static final long serialVersionUID = -530462146;
+	private static final long serialVersionUID = 838999346;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CustomerID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String   Name;
 	private java.lang.Integer  SalesPersonID;
 	private java.lang.Object   Demographics;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/StoreContact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/StoreContact.java
index cef22ce174..30d72d0097 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/StoreContact.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/StoreContact.java
@@ -12,12 +12,22 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 })
 public class StoreContact implements java.io.Serializable {
 
-	private static final long serialVersionUID = 922184445;
+	private static final long serialVersionUID = 505331097;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  CustomerID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer  ContactTypeID;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.String   rowguid;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Timestamp ModifiedDate;
 
 	@javax.persistence.Column(name = "CustomerID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualCustomer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualCustomer.java
index 56a350edaf..ae50494978 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualCustomer.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualCustomer.java
@@ -10,23 +10,63 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "vIndividualCustomer", schema = "Sales")
 public class vIndividualCustomer implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1389191150;
+	private static final long serialVersionUID = -840043570;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer CustomerID;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String  Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String  Suffix;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String  Phone;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer EmailPromotion;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  AddressType;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String  AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String  City;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  StateProvinceName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String  PostalCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  CountryRegionName;
 	private java.lang.Object  Demographics;
 
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualDemographics.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualDemographics.java
index cde9e69848..2420a7ad73 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualDemographics.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vIndividualDemographics.java
@@ -10,18 +10,30 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "vIndividualDemographics", schema = "Sales")
 public class vIndividualDemographics implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1487037718;
+	private static final long serialVersionUID = 985950176;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    CustomerID;
 	private java.math.BigDecimal TotalPurchaseYTD;
 	private java.sql.Timestamp   DateFirstPurchase;
 	private java.sql.Timestamp   BirthDate;
+
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String     MaritalStatus;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     YearlyIncome;
+
+	@javax.validation.constraints.Size(max = 1)
 	private java.lang.String     Gender;
 	private java.lang.Integer    TotalChildren;
 	private java.lang.Integer    NumberChildrenAtHome;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     Education;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     Occupation;
 	private java.lang.Boolean    HomeOwnerFlag;
 	private java.lang.Integer    NumberCarsOwned;
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPerson.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPerson.java
index 5e98c767d9..1c7703a6f2 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPerson.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPerson.java
@@ -10,28 +10,76 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "vSalesPerson", schema = "Sales")
 public class vSalesPerson implements java.io.Serializable {
 
-	private static final long serialVersionUID = -614769792;
+	private static final long serialVersionUID = -1541766768;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    SalesPersonID;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String     Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String     Suffix;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     JobTitle;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     Phone;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    EmailPromotion;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String     AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String     AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     City;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     StateProvinceName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String     PostalCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     CountryRegionName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     TerritoryName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     TerritoryGroup;
 	private java.math.BigDecimal SalesQuota;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesYTD;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal SalesLastYear;
 
 	@javax.persistence.Column(name = "SalesPersonID", nullable = false, precision = 10)
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPersonSalesByFiscalYears.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPersonSalesByFiscalYears.java
index 330acfd873..e4aeef9cde 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPersonSalesByFiscalYears.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vSalesPersonSalesByFiscalYears.java
@@ -10,11 +10,19 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "vSalesPersonSalesByFiscalYears", schema = "Sales")
 public class vSalesPersonSalesByFiscalYears implements java.io.Serializable {
 
-	private static final long serialVersionUID = -664734633;
+	private static final long serialVersionUID = -145978188;
 
 	private java.lang.Integer    SalesPersonID;
+
+	@javax.validation.constraints.Size(max = 152)
 	private java.lang.String     FullName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     SalesTerritory;
 	private java.math.BigDecimal _2002;
 	private java.math.BigDecimal _2003;
diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vStoreWithDemographics.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vStoreWithDemographics.java
index 84c13ad736..75deca78a2 100644
--- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vStoreWithDemographics.java
+++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/pojos/vStoreWithDemographics.java
@@ -10,34 +10,90 @@ package org.jooq.examples.sqlserver.adventureworks.sales.tables.pojos;
 @javax.persistence.Table(name = "vStoreWithDemographics", schema = "Sales")
 public class vStoreWithDemographics implements java.io.Serializable {
 
-	private static final long serialVersionUID = 249264575;
+	private static final long serialVersionUID = 1745643013;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    CustomerID;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Name;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     ContactType;
+
+	@javax.validation.constraints.Size(max = 8)
 	private java.lang.String     Title;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     FirstName;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     MiddleName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     LastName;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String     Suffix;
+
+	@javax.validation.constraints.Size(max = 25)
 	private java.lang.String     Phone;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     EmailAddress;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    EmailPromotion;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     AddressType;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String     AddressLine1;
+
+	@javax.validation.constraints.Size(max = 60)
 	private java.lang.String     AddressLine2;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     City;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     StateProvinceName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 15)
 	private java.lang.String     PostalCode;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     CountryRegionName;
 	private java.math.BigDecimal AnnualSales;
 	private java.math.BigDecimal AnnualRevenue;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     BankName;
+
+	@javax.validation.constraints.Size(max = 5)
 	private java.lang.String     BusinessType;
 	private java.lang.Integer    YearOpened;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String     Specialty;
 	private java.lang.Integer    SquareFeet;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     Brands;
+
+	@javax.validation.constraints.Size(max = 30)
 	private java.lang.String     Internet;
 	private java.lang.Integer    NumberEmployees;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java
index 32eba74f3d..8351c83141 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TAuthor.java
@@ -10,10 +10,17 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
 @javax.persistence.Table(name = "T_AUTHOR", schema = "MULTI_SCHEMA")
 public class TAuthor implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1528833410;
+	private static final long serialVersionUID = 1146418578;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  firstName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  lastName;
 	private java.sql.Date     dateOfBirth;
 	private java.lang.Integer yearOfBirth;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java
index b273c771cf..03f6844f23 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBook.java
@@ -10,15 +10,28 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
 @javax.persistence.Table(name = "T_BOOK", schema = "MULTI_SCHEMA")
 public class TBook implements java.io.Serializable {
 
-	private static final long serialVersionUID = -564243036;
+	private static final long serialVersionUID = 986192358;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          id;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          authorId;
 	private java.lang.Integer                                          coAuthorId;
 	private java.lang.Integer                                          detailsId;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String                                           title;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          publishedIn;
+
+	@javax.validation.constraints.NotNull
 	private org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId;
+
+	@javax.validation.constraints.Size(max = 4000)
 	private java.lang.String                                           contentText;
 	private byte[]                                                     contentPdf;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java
index 87bfa85af3..9711c9ef7e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/multi_schema/tables/pojos/TBookSale.java
@@ -10,12 +10,23 @@ package org.jooq.test.oracle.generatedclasses.multi_schema.tables.pojos;
 @javax.persistence.Table(name = "T_BOOK_SALE", schema = "MULTI_SCHEMA")
 public class TBookSale implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1195046825;
+	private static final long serialVersionUID = 405656248;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    id;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    bookId;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String     bookStoreName;
+
+	@javax.validation.constraints.NotNull
 	private java.sql.Date        soldAt;
+
+	@javax.validation.constraints.NotNull
 	private java.math.BigDecimal soldFor;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java
index e89ee3b449..7ae126a648 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TArrays.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_ARRAYS", schema = "TEST")
 public class TArrays implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1739262558;
+	private static final long serialVersionUID = -1858509506;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                                             id;
 	private org.jooq.test.oracle.generatedclasses.test.udt.records.UStringArrayRecord     stringArray;
 	private org.jooq.test.oracle.generatedclasses.test.udt.records.UNumberArrayRecord     numberArray;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java
index cfd48210c0..83e3ab64c0 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TAuthor.java
@@ -12,10 +12,17 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_AUTHOR", schema = "TEST")
 public class TAuthor implements java.io.Serializable {
 
-	private static final long serialVersionUID = 893041788;
+	private static final long serialVersionUID = -173901300;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                                         id;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String                                                          firstName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String                                                          lastName;
 	private java.sql.Date                                                             dateOfBirth;
 	private java.lang.Integer                                                         yearOfBirth;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java
index 5855674144..a8297eaf38 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBook.java
@@ -12,15 +12,28 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_BOOK", schema = "TEST")
 public class TBook implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1863594769;
+	private static final long serialVersionUID = 401057363;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          id;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          authorId;
 	private java.lang.Integer                                          coAuthorId;
 	private java.lang.Integer                                          detailsId;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String                                           title;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                          publishedIn;
+
+	@javax.validation.constraints.NotNull
 	private org.jooq.test.oracle.generatedclasses.test.enums.TLanguage languageId;
+
+	@javax.validation.constraints.Size(max = 4000)
 	private java.lang.String                                           contentText;
 	private byte[]                                                     contentPdf;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java
index a1e09077de..bf44c01ee5 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookStore.java
@@ -12,8 +12,11 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_BOOK_STORE", schema = "TEST")
 public class TBookStore implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1841678988;
+	private static final long serialVersionUID = -506920109;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String name;
 
 	@javax.persistence.Column(name = "NAME", unique = true, nullable = false, length = 400)
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java
index 8fc9b96dd2..e78ab264db 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBookToBookStore.java
@@ -14,9 +14,14 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 })
 public class TBookToBookStore implements java.io.Serializable {
 
-	private static final long serialVersionUID = -573665373;
+	private static final long serialVersionUID = 129941594;
 
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String  bookStoreName;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer bookId;
 	private java.lang.Integer stock;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java
index d9719bd3b3..c2ef5af151 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TBooleans.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_BOOLEANS", schema = "TEST")
 public class TBooleans implements java.io.Serializable {
 
-	private static final long serialVersionUID = -2135497983;
+	private static final long serialVersionUID = -484588059;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                            id;
 	private org.jooq.test._.converters.Boolean_10        oneZero;
 	private org.jooq.test._.converters.Boolean_TF_LC     trueFalseLc;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java
index 715cae9106..e5983addda 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDates.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_DATES", schema = "TEST")
 public class TDates implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1288318414;
+	private static final long serialVersionUID = -269895218;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer          id;
 	private java.sql.Date              d;
 	private java.sql.Timestamp         t;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java
index a9f3420bd5..a644b988d5 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TDirectory.java
@@ -10,11 +10,15 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_DIRECTORY", schema = "TEST")
 public class TDirectory implements java.io.Serializable {
 
-	private static final long serialVersionUID = 986299765;
+	private static final long serialVersionUID = -1617663511;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
 	private java.lang.Integer parentId;
 	private java.lang.Integer isDirectory;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  name;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java
index a65b1f3ea2..48810ec5a3 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/TTriggers.java
@@ -10,10 +10,16 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_TRIGGERS", schema = "TEST")
 public class TTriggers implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1859609492;
+	private static final long serialVersionUID = 1138335184;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer idGenerated;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer counter;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java
index 079549f12b..59b6bcf444 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_639NumbersTable.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_639_NUMBERS_TABLE", schema = "TEST")
 public class T_639NumbersTable implements java.io.Serializable {
 
-	private static final long serialVersionUID = 897742490;
+	private static final long serialVersionUID = -131380610;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    id;
 	private java.lang.Byte       byte_;
 	private java.lang.Short      short_;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java
index 3cb0308a5d..7bbf17da84 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_725LobTest.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_725_LOB_TEST", schema = "TEST")
 public class T_725LobTest implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1913886008;
+	private static final long serialVersionUID = -55337956;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
 	private byte[]            lob;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java
index ee93482bfe..eac311ed2e 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/T_785.java
@@ -10,10 +10,14 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "T_785", schema = "TEST")
 public class T_785 implements java.io.Serializable {
 
-	private static final long serialVersionUID = 2082517974;
+	private static final long serialVersionUID = 443984484;
 
 	private java.lang.Integer id;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  name;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String  value;
 
 	@javax.persistence.Column(name = "ID", precision = 7)
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
index a6c652634b..fbfc6494b2 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VAuthor.java
@@ -10,10 +10,17 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "V_AUTHOR", schema = "TEST")
 public class VAuthor implements java.io.Serializable {
 
-	private static final long serialVersionUID = 1980522144;
+	private static final long serialVersionUID = 312765320;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer                                                         id;
+
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String                                                          firstName;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 50)
 	private java.lang.String                                                          lastName;
 	private java.sql.Date                                                             dateOfBirth;
 	private java.lang.Integer                                                         yearOfBirth;
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java
index b9f25ffe98..f760be6c7d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VBook.java
@@ -10,15 +10,28 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "V_BOOK", schema = "TEST")
 public class VBook implements java.io.Serializable {
 
-	private static final long serialVersionUID = 727181009;
+	private static final long serialVersionUID = -1737200263;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer authorId;
 	private java.lang.Integer coAuthorId;
 	private java.lang.Integer detailsId;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String  title;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer publishedIn;
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer languageId;
+
+	@javax.validation.constraints.Size(max = 4000)
 	private java.lang.String  contentText;
 	private byte[]            contentPdf;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java
index 30b07f4824..4e6ed38c4b 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/VLibrary.java
@@ -10,9 +10,14 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "V_LIBRARY", schema = "TEST")
 public class VLibrary implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1620481067;
+	private static final long serialVersionUID = 1180434337;
 
+
+	@javax.validation.constraints.Size(max = 101)
 	private java.lang.String author;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 400)
 	private java.lang.String title;
 
 	@javax.persistence.Column(name = "AUTHOR", length = 101)
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java
index 3ed6aee9b5..3e2e334f7a 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_64_69.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "X_TEST_CASE_64_69", schema = "TEST")
 public class XTestCase_64_69 implements java.io.Serializable {
 
-	private static final long serialVersionUID = -340505534;
+	private static final long serialVersionUID = 386948830;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
 	private java.lang.Integer unusedId;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java
index 21b5412e1e..9cb2c74c4d 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_71.java
@@ -10,8 +10,10 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "X_TEST_CASE_71", schema = "TEST")
 public class XTestCase_71 implements java.io.Serializable {
 
-	private static final long serialVersionUID = -807459782;
+	private static final long serialVersionUID = 1945733406;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
 	private java.lang.Short   testCase_64_69Id;
 
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java
index b3b65fd5ca..aa9ef07f77 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XTestCase_85.java
@@ -10,10 +10,14 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 @javax.persistence.Table(name = "X_TEST_CASE_85", schema = "TEST")
 public class XTestCase_85 implements java.io.Serializable {
 
-	private static final long serialVersionUID = -587394071;
+	private static final long serialVersionUID = 214257967;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer id;
 	private java.lang.Integer xUnusedId;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String  xUnusedName;
 
 	@javax.persistence.Id
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java
index 02a8237e79..6d41214182 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/tables/pojos/XUnused.java
@@ -14,9 +14,14 @@ package org.jooq.test.oracle.generatedclasses.test.tables.pojos;
 })
 public class XUnused implements java.io.Serializable {
 
-	private static final long serialVersionUID = -1762959866;
+	private static final long serialVersionUID = -1975398536;
 
+
+	@javax.validation.constraints.NotNull
 	private java.lang.Integer    id;
+
+	@javax.validation.constraints.NotNull
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String     name;
 	private java.math.BigInteger bigInteger;
 	private java.lang.Integer    idRef;
@@ -28,9 +33,13 @@ public class XUnused implements java.io.Serializable {
 	private java.lang.Integer    type0;
 	private java.lang.Integer    primaryKey;
 	private java.lang.Integer    primarykey;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String     nameRef;
 	private java.math.BigDecimal field_737;
 	private java.lang.Integer    msUnusedIdRef;
+
+	@javax.validation.constraints.Size(max = 10)
 	private java.lang.String     msUnusedNameRef;
 
 	@javax.persistence.Column(name = "ID", unique = true, nullable = false, precision = 7)
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 80c3f37a52..cbd1e45f43 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -282,5 +282,13 @@
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.1.0.Alpha1</version>
+			<type>jar</type>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file