From 906df54303038e5a9823fa328d6dc39f1b7ca806 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 6 Apr 2013 21:17:18 +0200 Subject: [PATCH] [#2380] Rename org.jooq.impl.Factory to org.jooq.DSL - Step 1 - Renamed org.jooq.impl.Factory to org.jooq.impl.DSL --- .../org/jooq/debug/impl/DebugProcessor.java | 4 +- .../org/jooq/liquibase/LiquibaseTable.java | 2 +- .../org/jooq/liquibase/test/AdaptersTest.java | 4 +- .../jooq/util/AbstractTableDefinition.java | 2 +- .../java/org/jooq/util/ase/ASEDatabase.java | 10 +- .../org/jooq/util/cubrid/CUBRIDDatabase.java | 10 +- .../java/org/jooq/util/db2/DB2Database.java | 10 +- .../org/jooq/util/derby/DerbyDatabase.java | 6 +- .../jooq/util/derby/DerbyTableDefinition.java | 2 +- .../jooq/util/firebird/FirebirdDatabase.java | 4 +- .../firebird/FirebirdTableDefinition.java | 2 +- .../java/org/jooq/util/h2/H2Database.java | 4 +- .../org/jooq/util/hsqldb/HSQLDBDatabase.java | 6 +- .../util/hsqldb/HSQLDBRoutineDefinition.java | 2 +- .../util/hsqldb/HSQLDBTableDefinition.java | 8 +- .../org/jooq/util/ingres/IngresDatabase.java | 6 +- .../util/ingres/IngresTableDefinition.java | 2 +- .../java/org/jooq/util/jdbc/JDBCDatabase.java | 4 +- .../org/jooq/util/mysql/MySQLDatabase.java | 4 +- .../org/jooq/util/oracle/OracleDatabase.java | 4 +- .../util/oracle/OracleRoutineDefinition.java | 2 +- .../util/oracle/OracleTableDefinition.java | 4 +- .../jooq/util/postgres/PostgresDatabase.java | 18 +- .../org/jooq/util/sqlite/SQLiteDatabase.java | 4 +- .../util/sqlserver/SQLServerDatabase.java | 4 +- .../sqlserver/SQLServerTableDefinition.java | 2 +- .../org/jooq/util/sybase/SybaseDatabase.java | 8 +- .../org/jooq/examples/AdventureWorks.java | 6 +- .../org/jooq/examples/DBMS_XPLAN.java | 6 +- .../examples/org/jooq/examples/Library.java | 8 +- .../examples/org/jooq/examples/Sakila.java | 4 +- .../dbo/tables/records/AWBuildVersion.java | 4 +- .../dbo/tables/records/DatabaseLog.java | 4 +- .../dbo/tables/records/ErrorLog.java | 4 +- .../tables/records/Department.java | 4 +- .../tables/records/Employee.java | 4 +- .../tables/records/EmployeeAddress.java | 4 +- .../records/EmployeeDepartmentHistory.java | 4 +- .../tables/records/EmployeePayHistory.java | 4 +- .../tables/records/JobCandidate.java | 4 +- .../humanresources/tables/records/Shift.java | 4 +- .../tables/records/vEmployee.java | 4 +- .../tables/records/vEmployeeDepartment.java | 4 +- .../records/vEmployeeDepartmentHistory.java | 4 +- .../tables/records/vJobCandidate.java | 4 +- .../records/vJobCandidateEducation.java | 4 +- .../records/vJobCandidateEmployment.java | 4 +- .../person/tables/records/Address.java | 4 +- .../person/tables/records/AddressType.java | 4 +- .../person/tables/records/Contact.java | 4 +- .../person/tables/records/ContactType.java | 4 +- .../person/tables/records/CountryRegion.java | 4 +- .../person/tables/records/StateProvince.java | 4 +- .../records/vAdditionalContactInfo.java | 4 +- .../records/vStateProvinceCountryRegion.java | 4 +- .../tables/records/BillOfMaterials.java | 4 +- .../production/tables/records/Culture.java | 4 +- .../production/tables/records/Document.java | 4 +- .../tables/records/Illustration.java | 4 +- .../production/tables/records/Location.java | 4 +- .../tables/records/ProductCategory.java | 4 +- .../tables/records/ProductCostHistory.java | 4 +- .../tables/records/ProductDescription.java | 4 +- .../tables/records/ProductDocument.java | 4 +- .../tables/records/ProductInventory.java | 4 +- .../records/ProductListPriceHistory.java | 4 +- .../tables/records/ProductModel.java | 4 +- .../records/ProductModelIllustration.java | 4 +- ...ProductModelProductDescriptionCulture.java | 4 +- .../tables/records/ProductPhoto.java | 4 +- .../tables/records/ProductProductPhoto.java | 4 +- .../tables/records/ProductReview.java | 4 +- .../tables/records/ProductSubcategory.java | 4 +- .../tables/records/ScrapReason.java | 4 +- .../tables/records/TransactionHistory.java | 4 +- .../records/TransactionHistoryArchive.java | 4 +- .../tables/records/UnitMeasure.java | 4 +- .../production/tables/records/WorkOrder.java | 4 +- .../tables/records/WorkOrderRouting.java | 4 +- .../records/vProductAndDescription.java | 4 +- .../records/vProductModelInstructions.java | 4 +- .../tables/records/ProductVendor.java | 4 +- .../tables/records/PurchaseOrderDetail.java | 4 +- .../tables/records/PurchaseOrderHeader.java | 4 +- .../purchasing/tables/records/ShipMethod.java | 4 +- .../purchasing/tables/records/Vendor.java | 4 +- .../tables/records/VendorAddress.java | 4 +- .../tables/records/VendorContact.java | 4 +- .../purchasing/tables/records/vVendor.java | 4 +- .../tables/records/ContactCreditCard.java | 4 +- .../tables/records/CountryRegionCurrency.java | 4 +- .../sales/tables/records/CreditCard.java | 4 +- .../sales/tables/records/Currency.java | 4 +- .../sales/tables/records/CurrencyRate.java | 4 +- .../sales/tables/records/Customer.java | 4 +- .../sales/tables/records/CustomerAddress.java | 4 +- .../sales/tables/records/Individual.java | 4 +- .../tables/records/SalesOrderDetail.java | 4 +- .../records/SalesOrderHeaderSalesReason.java | 4 +- .../sales/tables/records/SalesPerson.java | 4 +- .../records/SalesPersonQuotaHistory.java | 4 +- .../sales/tables/records/SalesReason.java | 4 +- .../sales/tables/records/SalesTaxRate.java | 4 +- .../sales/tables/records/SalesTerritory.java | 4 +- .../tables/records/SalesTerritoryHistory.java | 4 +- .../tables/records/ShoppingCartItem.java | 4 +- .../sales/tables/records/SpecialOffer.java | 4 +- .../tables/records/SpecialOfferProduct.java | 4 +- .../sales/tables/records/Store.java | 4 +- .../sales/tables/records/StoreContact.java | 4 +- .../tables/records/vIndividualCustomer.java | 4 +- .../records/vIndividualDemographics.java | 4 +- .../sales/tables/records/vSalesPerson.java | 4 +- .../vSalesPersonSalesByFiscalYears.java | 4 +- jOOQ-test/src/org/jooq/test/ASETest.java | 4 +- jOOQ-test/src/org/jooq/test/CUBRIDTest.java | 4 +- jOOQ-test/src/org/jooq/test/DB2Test.java | 4 +- jOOQ-test/src/org/jooq/test/DerbyTest.java | 4 +- jOOQ-test/src/org/jooq/test/FirebirdTest.java | 4 +- jOOQ-test/src/org/jooq/test/H2Test.java | 6 +- jOOQ-test/src/org/jooq/test/HSQLDBTest.java | 4 +- jOOQ-test/src/org/jooq/test/HSQLDBTest2.java | 4 +- jOOQ-test/src/org/jooq/test/IngresTest.java | 4 +- jOOQ-test/src/org/jooq/test/MySQLTest.java | 10 +- .../org/jooq/test/MySQLTestSchemaMapping.java | 4 +- .../org/jooq/test/MySQLTestSchemaRewrite.java | 4 +- jOOQ-test/src/org/jooq/test/OracleTest.java | 16 +- .../src/org/jooq/test/OracleTestInline.java | 4 +- jOOQ-test/src/org/jooq/test/PostgresTest.java | 6 +- .../src/org/jooq/test/SQLServerTest.java | 4 +- .../org/jooq/test/SQLServerTestInline.java | 4 +- jOOQ-test/src/org/jooq/test/SQLiteTest.java | 4 +- jOOQ-test/src/org/jooq/test/SybaseTest.java | 4 +- .../src/org/jooq/test/_/PrettyPrinter.java | 6 +- .../AggregateWindowFunctionTests.java | 82 +-- .../org/jooq/test/_/testcases/AliasTests.java | 12 +- .../org/jooq/test/_/testcases/CRUDTests.java | 4 +- .../jooq/test/_/testcases/DataTypeTests.java | 18 +- .../_/testcases/ExecuteListenerTests.java | 4 +- .../jooq/test/_/testcases/ExoticTests.java | 40 +- .../org/jooq/test/_/testcases/FetchTests.java | 6 +- .../jooq/test/_/testcases/FunctionTests.java | 152 +++--- .../jooq/test/_/testcases/GeneralTests.java | 22 +- .../jooq/test/_/testcases/GroupByTests.java | 16 +- .../test/_/testcases/InsertUpdateTests.java | 28 +- .../org/jooq/test/_/testcases/JoinTests.java | 18 +- .../jooq/test/_/testcases/LoaderTests.java | 2 +- .../jooq/test/_/testcases/OrderByTests.java | 16 +- .../jooq/test/_/testcases/PlainSQLTests.java | 18 +- .../jooq/test/_/testcases/PredicateTests.java | 30 +- .../test/_/testcases/RenderAndBindTests.java | 8 +- .../test/_/testcases/RoutineAndUDTTests.java | 4 +- .../_/testcases/RowValueExpressionTests.java | 18 +- .../_/testcases/SchemaAndMappingTests.java | 4 +- .../jooq/test/_/testcases/SelectTests.java | 14 +- .../jooq/test/_/testcases/StatementTests.java | 4 +- .../_/testcases/ValuesConstructorTests.java | 4 +- .../tables/records/TAuthorRecord.java | 4 +- .../tables/records/TBookStoreRecord.java | 4 +- .../records/TBookToBookStoreRecord.java | 4 +- .../tables/records/TDatesRecord.java | 4 +- .../tables/records/TIdentityPkRecord.java | 4 +- .../tables/records/TIdentityRecord.java | 4 +- .../tables/records/TLanguageRecord.java | 4 +- .../tables/records/TTriggersRecord.java | 4 +- .../tables/records/T_725LobTestRecord.java | 4 +- .../tables/records/T_785Record.java | 4 +- .../tables/records/T_986_1Record.java | 4 +- .../tables/records/T_986_2Record.java | 4 +- .../tables/records/VAuthorRecord.java | 4 +- .../tables/records/VLibraryRecord.java | 4 +- .../tables/records/XTestCase_64_69Record.java | 4 +- .../tables/records/XTestCase_71Record.java | 4 +- .../tables/records/XTestCase_85Record.java | 4 +- .../tables/records/TAuthorRecord.java | 4 +- .../tables/records/TBookRecord.java | 4 +- .../tables/records/TBookStoreRecord.java | 4 +- .../records/TBookToBookStoreRecord.java | 4 +- .../tables/records/TBooleansRecord.java | 4 +- .../tables/records/TDatesRecord.java | 4 +- .../tables/records/TIdentityPkRecord.java | 4 +- .../tables/records/TIdentityRecord.java | 4 +- .../tables/records/TLanguageRecord.java | 4 +- .../tables/records/TTriggersRecord.java | 4 +- .../records/T_639NumbersTableRecord.java | 4 +- .../tables/records/T_725LobTestRecord.java | 4 +- .../tables/records/T_785Record.java | 4 +- .../tables/records/T_986_1Record.java | 4 +- .../tables/records/T_986_2Record.java | 4 +- .../tables/records/VAuthorRecord.java | 4 +- .../tables/records/VBookRecord.java | 4 +- .../tables/records/VLibraryRecord.java | 4 +- .../tables/records/XTestCase_2025Record.java | 4 +- .../tables/records/XTestCase_64_69Record.java | 4 +- .../tables/records/XTestCase_71Record.java | 4 +- .../tables/records/XTestCase_85Record.java | 4 +- .../tables/records/XUnusedRecord.java | 4 +- jOOQ-test/src/org/jooq/test/h2/F.java | 10 +- .../org/jooq/test/h2/TTriggersTrigger.java | 4 +- .../tables/records/TAuthorRecord.java | 4 +- .../tables/records/TBookRecord.java | 4 +- .../tables/records/TBookStoreRecord.java | 4 +- .../records/TBookToBookStoreRecord.java | 4 +- .../tables/records/TBooleansRecord.java | 4 +- .../tables/records/TDatesRecord.java | 4 +- .../tables/records/TIdentityPkRecord.java | 4 +- .../tables/records/TIdentityRecord.java | 4 +- .../tables/records/TLanguageRecord.java | 4 +- .../tables/records/TTriggersRecord.java | 4 +- .../records/T_639NumbersTableRecord.java | 4 +- .../tables/records/T_725LobTestRecord.java | 4 +- .../tables/records/T_785Record.java | 4 +- .../tables/records/VAuthorRecord.java | 4 +- .../tables/records/VBookRecord.java | 4 +- .../tables/records/VLibraryRecord.java | 4 +- .../tables/records/XTestCase_64_69Record.java | 4 +- .../tables/records/XTestCase_71Record.java | 4 +- .../tables/records/XTestCase_85Record.java | 4 +- .../tables/records/XUnusedRecord.java | 4 +- .../src/org/jooq/test/jOOQAbstractTest.java | 6 +- .../tables/records/TArraysRecord.java | 4 +- .../tables/records/TAuthorRecord.java | 4 +- .../tables/records/TBookRecord.java | 4 +- .../tables/records/TBookStoreRecord.java | 4 +- .../records/TBookToBookStoreRecord.java | 4 +- .../tables/records/TBooleansRecord.java | 4 +- .../tables/records/TDatesRecord.java | 4 +- .../tables/records/TIdentityPkRecord.java | 4 +- .../tables/records/TIdentityRecord.java | 4 +- .../tables/records/TLanguageRecord.java | 4 +- .../tables/records/TTriggersRecord.java | 4 +- .../records/T_639NumbersTableRecord.java | 4 +- .../tables/records/T_725LobTestRecord.java | 4 +- .../tables/records/T_785Record.java | 4 +- .../tables/records/T_877Record.java | 4 +- .../tables/records/VAuthorRecord.java | 4 +- .../tables/records/VBookRecord.java | 4 +- .../tables/records/VLibraryRecord.java | 4 +- .../tables/records/XTestCase_64_69Record.java | 4 +- .../tables/records/XTestCase_71Record.java | 4 +- .../tables/records/XTestCase_85Record.java | 4 +- .../tables/records/XUnusedRecord.java | 4 +- .../src/org/jooq/xtend/BetweenAndSteps.xtend | 2 +- jOOQ-tools/src/org/jooq/xtend/Factory.xtend | 4 +- jOOQ-tools/src/org/jooq/xtend/Rows.xtend | 2 +- jOOQ/src/main/java/org/jooq/Case.java | 4 +- jOOQ/src/main/java/org/jooq/Condition.java | 16 +- jOOQ/src/main/java/org/jooq/DSLContext.java | 238 ++++----- .../java/org/jooq/DeleteConditionStep.java | 14 +- .../main/java/org/jooq/DeleteWhereStep.java | 8 +- .../org/jooq/DivideByOnConditionStep.java | 14 +- .../main/java/org/jooq/DivideByOnStep.java | 8 +- .../main/java/org/jooq/ExecuteListener.java | 4 +- jOOQ/src/main/java/org/jooq/Field.java | 372 +++++++------- .../java/org/jooq/GroupConcatOrderByStep.java | 4 +- .../org/jooq/GroupConcatSeparatorStep.java | 4 +- .../java/org/jooq/MergeOnConditionStep.java | 14 +- jOOQ/src/main/java/org/jooq/MergeOnStep.java | 8 +- jOOQ/src/main/java/org/jooq/Param.java | 4 +- jOOQ/src/main/java/org/jooq/Query.java | 10 +- jOOQ/src/main/java/org/jooq/SQLDialect.java | 8 +- .../java/org/jooq/SelectConditionStep.java | 14 +- .../jooq/SelectConnectByConditionStep.java | 8 +- .../java/org/jooq/SelectConnectByStep.java | 14 +- .../main/java/org/jooq/SelectFromStep.java | 8 +- .../org/jooq/SelectHavingConditionStep.java | 14 +- .../main/java/org/jooq/SelectHavingStep.java | 8 +- .../main/java/org/jooq/SelectJoinStep.java | 50 +- .../java/org/jooq/SelectOnConditionStep.java | 14 +- jOOQ/src/main/java/org/jooq/SelectOnStep.java | 8 +- .../java/org/jooq/SelectStartWithStep.java | 8 +- .../main/java/org/jooq/SelectWhereStep.java | 8 +- jOOQ/src/main/java/org/jooq/Table.java | 52 +- .../java/org/jooq/TableOnConditionStep.java | 14 +- jOOQ/src/main/java/org/jooq/TableOnStep.java | 8 +- .../java/org/jooq/UpdateConditionStep.java | 14 +- .../main/java/org/jooq/UpdateWhereStep.java | 8 +- .../java/org/jooq/impl/AbstractCondition.java | 6 +- .../java/org/jooq/impl/AbstractField.java | 232 ++++----- .../java/org/jooq/impl/AbstractQueryPart.java | 6 +- .../java/org/jooq/impl/AbstractRoutine.java | 6 +- .../java/org/jooq/impl/AbstractSelect.java | 2 +- .../java/org/jooq/impl/AbstractStore.java | 2 +- .../org/jooq/impl/AbstractStoreQuery.java | 2 +- .../java/org/jooq/impl/AbstractTable.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Alias.java | 6 +- .../java/org/jooq/impl/ArrayConstant.java | 2 +- .../main/java/org/jooq/impl/ArrayTable.java | 4 +- .../org/jooq/impl/ArrayTableSimulation.java | 12 +- jOOQ/src/main/java/org/jooq/impl/Ascii.java | 2 +- .../main/java/org/jooq/impl/BatchCRUD.java | 2 +- .../java/org/jooq/impl/BatchMultiple.java | 2 +- .../main/java/org/jooq/impl/BatchSingle.java | 2 +- .../java/org/jooq/impl/BetweenCondition.java | 2 +- .../src/main/java/org/jooq/impl/BitCount.java | 8 +- jOOQ/src/main/java/org/jooq/impl/Cast.java | 10 +- jOOQ/src/main/java/org/jooq/impl/Ceil.java | 4 +- .../java/org/jooq/impl/CombinedCondition.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Concat.java | 4 +- .../java/org/jooq/impl/ConditionAsField.java | 4 +- .../org/jooq/impl/ConditionProviderImpl.java | 2 +- .../src/main/java/org/jooq/impl/Contains.java | 8 +- jOOQ/src/main/java/org/jooq/impl/Cosh.java | 8 +- jOOQ/src/main/java/org/jooq/impl/Cot.java | 4 +- .../main/java/org/jooq/impl/CurrentDate.java | 4 +- .../main/java/org/jooq/impl/CurrentTime.java | 4 +- .../java/org/jooq/impl/CurrentTimestamp.java | 4 +- .../main/java/org/jooq/impl/CurrentUser.java | 4 +- jOOQ/src/main/java/org/jooq/impl/DAOImpl.java | 2 +- .../org/jooq/impl/{Factory.java => DSL.java} | 160 +++--- .../java/org/jooq/impl/DSLContextImpl.java | 22 +- .../src/main/java/org/jooq/impl/DateDiff.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Decode.java | 4 +- .../org/jooq/impl/DefaultConfiguration.java | 2 +- .../jooq/impl/DefaultConnectionProvider.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Degrees.java | 6 +- .../main/java/org/jooq/impl/DeleteImpl.java | 6 +- .../src/main/java/org/jooq/impl/DivideBy.java | 10 +- jOOQ/src/main/java/org/jooq/impl/Euler.java | 8 +- .../main/java/org/jooq/impl/Expression.java | 22 +- jOOQ/src/main/java/org/jooq/impl/Extract.java | 4 +- .../org/jooq/impl/FieldMapsForInsert.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Floor.java | 4 +- .../src/main/java/org/jooq/impl/Function.java | 2 +- .../src/main/java/org/jooq/impl/Greatest.java | 10 +- .../main/java/org/jooq/impl/GroupConcat.java | 2 +- .../java/org/jooq/impl/IsDistinctFrom.java | 8 +- .../main/java/org/jooq/impl/JoinTable.java | 6 +- jOOQ/src/main/java/org/jooq/impl/LTrim.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Least.java | 10 +- jOOQ/src/main/java/org/jooq/impl/Limit.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Ln.java | 6 +- .../main/java/org/jooq/impl/LoaderImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Lpad.java | 10 +- jOOQ/src/main/java/org/jooq/impl/MD5.java | 2 +- .../main/java/org/jooq/impl/MergeImpl.java | 8 +- .../org/jooq/impl/MetaDataFieldProvider.java | 2 +- .../src/main/java/org/jooq/impl/MetaImpl.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Mod.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Nvl.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Nvl2.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Pi.java | 10 +- jOOQ/src/main/java/org/jooq/impl/Pivot.java | 4 +- .../src/main/java/org/jooq/impl/Position.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Power.java | 4 +- .../org/jooq/impl/QuantifiedSelectImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RTrim.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Radians.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Rand.java | 4 +- .../java/org/jooq/impl/ReferenceImpl.java | 4 +- .../main/java/org/jooq/impl/RegexpLike.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Repeat.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Replace.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Rollup.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Round.java | 22 +- .../org/jooq/impl/RowBetweenCondition.java | 2 +- jOOQ/src/main/java/org/jooq/impl/RowImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Rpad.java | 10 +- .../main/java/org/jooq/impl/SelectImpl.java | 8 +- .../java/org/jooq/impl/SelectQueryImpl.java | 8 +- .../main/java/org/jooq/impl/SequenceImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Sign.java | 8 +- jOOQ/src/main/java/org/jooq/impl/Sinh.java | 8 +- .../java/org/jooq/impl/SortFieldImpl.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Sqrt.java | 4 +- .../main/java/org/jooq/impl/Substring.java | 6 +- jOOQ/src/main/java/org/jooq/impl/Tanh.java | 8 +- .../java/org/jooq/impl/TimestampDiff.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Trim.java | 4 +- jOOQ/src/main/java/org/jooq/impl/Trunc.java | 12 +- .../main/java/org/jooq/impl/UDTConstant.java | 2 +- .../main/java/org/jooq/impl/UpdateImpl.java | 6 +- .../java/org/jooq/impl/UpdateQueryImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Utils.java | 14 +- .../org/jooq/tools/jdbc/MockFileDatabase.java | 4 +- .../tools/jdbc/MockResultSetMetaData.java | 4 +- .../java/org/jooq/util/ase/ASEFactory.java | 4 +- .../org/jooq/util/cubrid/CUBRIDFactory.java | 4 +- .../java/org/jooq/util/db2/DB2Factory.java | 4 +- .../org/jooq/util/derby/DerbyFactory.java | 4 +- .../jooq/util/firebird/FirebirdFactory.java | 4 +- .../main/java/org/jooq/util/h2/H2Factory.java | 4 +- .../org/jooq/util/hsqldb/HSQLDBFactory.java | 4 +- .../org/jooq/util/ingres/IngresFactory.java | 4 +- .../org/jooq/util/mysql/MySQLFactory.java | 8 +- .../org/jooq/util/oracle/OracleFactory.java | 4 +- .../jooq/util/postgres/PostgresFactory.java | 4 +- .../org/jooq/util/sqlite/SQLiteFactory.java | 4 +- .../jooq/util/sqlserver/SQLServerFactory.java | 4 +- .../org/jooq/util/sybase/SybaseFactory.java | 4 +- .../test/java/org/jooq/test/AbstractTest.java | 4 +- .../test/java/org/jooq/test/BasicTest.java | 480 +++++++++--------- .../test/java/org/jooq/test/DataTypeTest.java | 2 +- .../src/test/java/org/jooq/test/MockTest.java | 20 +- .../test/java/org/jooq/test/SettingsTest.java | 12 +- 395 files changed, 1982 insertions(+), 1972 deletions(-) rename jOOQ/src/main/java/org/jooq/impl/{Factory.java => DSL.java} (96%) diff --git a/jOOQ-console/src/main/java/org/jooq/debug/impl/DebugProcessor.java b/jOOQ-console/src/main/java/org/jooq/debug/impl/DebugProcessor.java index 7e70096e33..2d26a69a2f 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/impl/DebugProcessor.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/impl/DebugProcessor.java @@ -59,7 +59,7 @@ import org.jooq.debug.QueryType; import org.jooq.debug.ResultLog; import org.jooq.debug.impl.LocalDebugger.DebuggerRegistry; import org.jooq.exception.DataAccessException; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; /** * @author Christopher Deckers @@ -260,7 +260,7 @@ class DebugProcessor { try { ctx.statement().close(); // Better return possibility? Based on originating query? - String sql = Factory.using(ctx.configuration().getDialect()).selectZero().where("1 = 2").getSQL(); + String sql = DSL.using(ctx.configuration().getDialect()).selectZero().where("1 = 2").getSQL(); ctx.sql(sql); ctx.statement(ctx.connection().prepareStatement(sql)); } catch(Exception e) { diff --git a/jOOQ-liquibase/src/main/java/org/jooq/liquibase/LiquibaseTable.java b/jOOQ-liquibase/src/main/java/org/jooq/liquibase/LiquibaseTable.java index f1fb1d1462..fd562205f5 100644 --- a/jOOQ-liquibase/src/main/java/org/jooq/liquibase/LiquibaseTable.java +++ b/jOOQ-liquibase/src/main/java/org/jooq/liquibase/LiquibaseTable.java @@ -35,7 +35,7 @@ */ package org.jooq.liquibase; -import static org.jooq.impl.Factory.tableByName; +import static org.jooq.impl.DSL.tableByName; import static org.jooq.liquibase.Adapters.dataType; import java.util.List; diff --git a/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java b/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java index 423728fa08..b26e5ac1b2 100644 --- a/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java +++ b/jOOQ-liquibase/src/test/java/org/jooq/liquibase/test/AdaptersTest.java @@ -59,7 +59,7 @@ import org.jooq.DSLContext; import org.jooq.Field; import org.jooq.SQLDialect; import org.jooq.Sequence; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.maven.example.h2.Sequences; import org.junit.After; @@ -81,7 +81,7 @@ public class AdaptersTest { database = new H2Database(); database.setConnection(new JdbcConnection(connection)); snapshot = DatabaseSnapshotGeneratorFactory.getInstance().createSnapshot(database, "PUBLIC", null); - create = Factory.using(connection, SQLDialect.H2); + create = DSL.using(connection, SQLDialect.H2); } @Before diff --git a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTableDefinition.java index fa212da7f1..062f02a1f2 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/AbstractTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/AbstractTableDefinition.java @@ -36,7 +36,7 @@ package org.jooq.util; -import static org.jooq.impl.Factory.table; +import static org.jooq.impl.DSL.table; import java.sql.SQLException; import java.util.List; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java index bfe9911af7..39cb9c2329 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ase/ASEDatabase.java @@ -36,9 +36,9 @@ package org.jooq.util.ase; import static java.util.Arrays.asList; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.val; import static org.jooq.util.ase.sys.tables.Sysindexes.SYSINDEXES; import static org.jooq.util.ase.sys.tables.Sysusers.SYSUSERS; @@ -52,7 +52,7 @@ import org.jooq.Record; import org.jooq.Record10; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.tools.JooqLogger; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; @@ -80,7 +80,7 @@ public class ASEDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.ASE); + return DSL.using(getConnection(), SQLDialect.ASE); } private SchemaDefinition getSchema() { diff --git a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java index 7382ea429d..258194de16 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/cubrid/CUBRIDDatabase.java @@ -36,9 +36,9 @@ package org.jooq.util.cubrid; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.fieldByName; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.fieldByName; +import static org.jooq.impl.DSL.val; import static org.jooq.util.cubrid.dba.Tables.DB_CLASS; import static org.jooq.util.cubrid.dba.Tables.DB_INDEX; import static org.jooq.util.cubrid.dba.Tables.DB_INDEX_KEY; @@ -58,7 +58,7 @@ import org.jooq.Record; import org.jooq.Record3; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -270,6 +270,6 @@ public class CUBRIDDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.CUBRID); + return DSL.using(getConnection(), SQLDialect.CUBRID); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java index ce9fe029aa..f69dd62688 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/db2/DB2Database.java @@ -35,9 +35,9 @@ */ package org.jooq.util.db2; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.two; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.two; +import static org.jooq.impl.DSL.val; import static org.jooq.util.db2.syscat.Tables.DATATYPES; import static org.jooq.util.db2.syscat.Tables.FUNCTIONS; import static org.jooq.util.db2.syscat.Tables.KEYCOLUSE; @@ -62,7 +62,7 @@ import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; import org.jooq.SelectQuery; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -94,7 +94,7 @@ public class DB2Database extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.DB2); + return DSL.using(getConnection(), SQLDialect.DB2); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java index 149d2cb9bd..f9cf6dd534 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyDatabase.java @@ -36,7 +36,7 @@ package org.jooq.util.derby; -import static org.jooq.impl.Factory.field; +import static org.jooq.impl.DSL.field; import static org.jooq.util.derby.sys.tables.Sysconglomerates.SYSCONGLOMERATES; import static org.jooq.util.derby.sys.tables.Sysconstraints.SYSCONSTRAINTS; import static org.jooq.util.derby.sys.tables.Syskeys.SYSKEYS; @@ -56,7 +56,7 @@ import org.jooq.Record; import org.jooq.Record5; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -323,6 +323,6 @@ public class DerbyDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.DERBY); + return DSL.using(getConnection(), SQLDialect.DERBY); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java index 84785b5d61..7f9c5775c8 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/derby/DerbyTableDefinition.java @@ -36,7 +36,7 @@ package org.jooq.util.derby; -import static org.jooq.impl.Factory.inline; +import static org.jooq.impl.DSL.inline; import static org.jooq.util.derby.sys.tables.Syscolumns.SYSCOLUMNS; import java.sql.SQLException; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java index 566b963665..16ae750e5b 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdDatabase.java @@ -50,7 +50,7 @@ import org.jooq.Record; import org.jooq.Record3; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -253,6 +253,6 @@ public class FirebirdDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.FIREBIRD); + return DSL.using(getConnection(), SQLDialect.FIREBIRD); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java index fd6e5ba260..4205218812 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/firebird/FirebirdTableDefinition.java @@ -35,7 +35,7 @@ */ package org.jooq.util.firebird; -import static org.jooq.impl.Factory.decode; +import static org.jooq.impl.DSL.decode; import static org.jooq.util.firebird.rdb.Tables.RDB$FIELDS; import static org.jooq.util.firebird.rdb.Tables.RDB$RELATION_FIELDS; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java index 25dc847d84..bc9af4d2d7 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/h2/H2Database.java @@ -52,7 +52,7 @@ import org.jooq.Record; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -83,7 +83,7 @@ public class H2Database extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.H2); + return DSL.using(getConnection(), SQLDialect.H2); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java index 0a94c25a3b..81d0e0aea6 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBDatabase.java @@ -36,7 +36,7 @@ package org.jooq.util.hsqldb; -import static org.jooq.impl.Factory.nvl; +import static org.jooq.impl.DSL.nvl; import static org.jooq.util.hsqldb.information_schema.Tables.ELEMENT_TYPES; import static org.jooq.util.hsqldb.information_schema.Tables.KEY_COLUMN_USAGE; import static org.jooq.util.hsqldb.information_schema.Tables.REFERENTIAL_CONSTRAINTS; @@ -55,7 +55,7 @@ import org.jooq.Record; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -80,7 +80,7 @@ public class HSQLDBDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.HSQLDB); + return DSL.using(getConnection(), SQLDialect.HSQLDB); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBRoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBRoutineDefinition.java index b71dc384db..6a50bf4147 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBRoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBRoutineDefinition.java @@ -35,7 +35,7 @@ */ package org.jooq.util.hsqldb; -import static org.jooq.impl.Factory.nvl; +import static org.jooq.impl.DSL.nvl; import static org.jooq.util.hsqldb.information_schema.Tables.ELEMENT_TYPES; import static org.jooq.util.hsqldb.information_schema.Tables.PARAMETERS; import static org.jooq.util.hsqldb.information_schema.Tables.ROUTINES; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBTableDefinition.java index 8134398c57..eabe8822a5 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/hsqldb/HSQLDBTableDefinition.java @@ -36,10 +36,10 @@ package org.jooq.util.hsqldb; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.nvl; -import static org.jooq.impl.Factory.nvl2; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.nvl; +import static org.jooq.impl.DSL.nvl2; +import static org.jooq.impl.DSL.val; import static org.jooq.util.hsqldb.information_schema.Tables.COLUMNS; import static org.jooq.util.hsqldb.information_schema.Tables.ELEMENT_TYPES; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java index 520b84204d..f658650e38 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresDatabase.java @@ -35,7 +35,7 @@ */ package org.jooq.util.ingres; -import static org.jooq.impl.Factory.trim; +import static org.jooq.impl.DSL.trim; import static org.jooq.util.ingres.ingres.Tables.IICONSTRAINTS; import static org.jooq.util.ingres.ingres.Tables.IICONSTRAINT_INDEXES; import static org.jooq.util.ingres.ingres.Tables.IIDB_COMMENTS; @@ -55,7 +55,7 @@ import org.jooq.Record; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -87,7 +87,7 @@ public class IngresDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.INGRES); + return DSL.using(getConnection(), SQLDialect.INGRES); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java index 3fd78e18bd..bdf7e8dc39 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/ingres/IngresTableDefinition.java @@ -35,7 +35,7 @@ */ package org.jooq.util.ingres; -import static org.jooq.impl.Factory.trim; +import static org.jooq.impl.DSL.trim; import static org.jooq.util.ingres.ingres.tables.Iicolumns.IICOLUMNS; import static org.jooq.util.ingres.ingres.tables.IidbSubcomments.IIDB_SUBCOMMENTS; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java index 264920387a..7b46e7924e 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/jdbc/JDBCDatabase.java @@ -45,7 +45,7 @@ import org.jooq.SQLDialect; import org.jooq.Schema; import org.jooq.Sequence; import org.jooq.Table; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.DataTypeDefinition; @@ -72,7 +72,7 @@ public class JDBCDatabase extends AbstractDatabase { @SuppressWarnings("deprecation") @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.SQL99); + return DSL.using(getConnection(), SQLDialect.SQL99); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java index 9d8932b964..dd836531e0 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/mysql/MySQLDatabase.java @@ -55,7 +55,7 @@ import org.jooq.Record4; import org.jooq.Record5; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -331,6 +331,6 @@ public class MySQLDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.MYSQL); + return DSL.using(getConnection(), SQLDialect.MYSQL); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java index 127fc08547..375d96d07c 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleDatabase.java @@ -58,7 +58,7 @@ import org.jooq.Record; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -407,6 +407,6 @@ public class OracleDatabase extends AbstractDatabase { */ @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.ORACLE); + return DSL.using(getConnection(), SQLDialect.ORACLE); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleRoutineDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleRoutineDefinition.java index 926a860413..2babbfc376 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleRoutineDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleRoutineDefinition.java @@ -36,7 +36,7 @@ package org.jooq.util.oracle; -import static org.jooq.impl.Factory.inline; +import static org.jooq.impl.DSL.inline; import static org.jooq.util.oracle.sys.Tables.ALL_ARGUMENTS; import static org.jooq.util.oracle.sys.Tables.ALL_COL_COMMENTS; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleTableDefinition.java index 930a3b831f..4e34fc9cf6 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/oracle/OracleTableDefinition.java @@ -36,8 +36,8 @@ package org.jooq.util.oracle; -import static org.jooq.impl.Factory.decode; -import static org.jooq.impl.Factory.inline; +import static org.jooq.impl.DSL.decode; +import static org.jooq.impl.DSL.inline; import static org.jooq.util.oracle.sys.Tables.ALL_COL_COMMENTS; import static org.jooq.util.oracle.sys.Tables.ALL_TAB_COLS; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java index 2894f22aa3..d36678507d 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/postgres/PostgresDatabase.java @@ -36,13 +36,13 @@ package org.jooq.util.postgres; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.decode; -import static org.jooq.impl.Factory.exists; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.upper; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.decode; +import static org.jooq.impl.DSL.exists; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.upper; +import static org.jooq.impl.DSL.val; import static org.jooq.util.postgres.information_schema.Tables.ATTRIBUTES; import static org.jooq.util.postgres.information_schema.Tables.KEY_COLUMN_USAGE; import static org.jooq.util.postgres.information_schema.Tables.PARAMETERS; @@ -65,7 +65,7 @@ import org.jooq.Record3; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -391,6 +391,6 @@ public class PostgresDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.POSTGRES); + return DSL.using(getConnection(), SQLDialect.POSTGRES); } } diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java index 5bfae99882..33652ef2bd 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlite/SQLiteDatabase.java @@ -46,7 +46,7 @@ import java.util.Map; import org.jooq.DSLContext; import org.jooq.Record; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -83,7 +83,7 @@ public class SQLiteDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.SQLITE); + return DSL.using(getConnection(), SQLDialect.SQLITE); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java index d6cc60081f..28239a4561 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerDatabase.java @@ -53,7 +53,7 @@ import org.jooq.Record; import org.jooq.Record4; import org.jooq.Result; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; import org.jooq.util.ColumnDefinition; @@ -78,7 +78,7 @@ public class SQLServerDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.SQLSERVER); + return DSL.using(getConnection(), SQLDialect.SQLSERVER); } @Override diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerTableDefinition.java b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerTableDefinition.java index 5526dd18c1..a0b5c6d388 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerTableDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/sqlserver/SQLServerTableDefinition.java @@ -36,7 +36,7 @@ package org.jooq.util.sqlserver; -import static org.jooq.impl.Factory.field; +import static org.jooq.impl.DSL.field; import static org.jooq.util.sqlserver.information_schema.Tables.COLUMNS; import java.sql.SQLException; diff --git a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java index 3ec7bc261e..da46ffb647 100644 --- a/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java +++ b/jOOQ-meta/src/main/java/org/jooq/util/sybase/SybaseDatabase.java @@ -30,8 +30,8 @@ */ package org.jooq.util.sybase; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.val; import static org.jooq.util.sybase.sys.Tables.SYSFKEY; import static org.jooq.util.sybase.sys.Tables.SYSIDX; import static org.jooq.util.sybase.sys.Tables.SYSIDXCOL; @@ -48,7 +48,7 @@ import java.util.List; import org.jooq.DSLContext; import org.jooq.Record; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.tools.JooqLogger; import org.jooq.util.AbstractDatabase; import org.jooq.util.ArrayDefinition; @@ -82,7 +82,7 @@ public class SybaseDatabase extends AbstractDatabase { @Override protected DSLContext create0() { - return Factory.using(getConnection(), SQLDialect.SYBASE); + return DSL.using(getConnection(), SQLDialect.SYBASE); } diff --git a/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java b/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java index 2cb0bc09e9..782312f3c1 100644 --- a/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java +++ b/jOOQ-test/examples/org/jooq/examples/AdventureWorks.java @@ -41,14 +41,14 @@ import static org.jooq.examples.sqlserver.adventureworks.humanresources.Tables.E import static org.jooq.examples.sqlserver.adventureworks.humanresources.Tables.EmployeeAddress; import static org.jooq.examples.sqlserver.adventureworks.humanresources.Tables.EmployeeDepartmentHistory; import static org.jooq.examples.sqlserver.adventureworks.person.Tables.Contact; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.val; import java.sql.Connection; import java.sql.DriverManager; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; public class AdventureWorks { @@ -56,7 +56,7 @@ public class AdventureWorks { Class.forName("com.microsoft.sqlserver.jdbc.SQLServerDriver"); Connection connection = DriverManager.getConnection("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks;integratedSecurity=true"); - DSLContext create = Factory.using(connection, SQLDialect.SQLSERVER); + DSLContext create = DSL.using(connection, SQLDialect.SQLSERVER); System.out.println(create .select(Employee.fields()) diff --git a/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java b/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java index 7255ad3ca0..0f63a1758f 100644 --- a/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java +++ b/jOOQ-test/examples/org/jooq/examples/DBMS_XPLAN.java @@ -35,7 +35,7 @@ */ package org.jooq.examples; -import static org.jooq.impl.Factory.table; +import static org.jooq.impl.DSL.table; import java.sql.Connection; import java.sql.DriverManager; @@ -43,7 +43,7 @@ import java.sql.DriverManager; import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.jooq.examples.oracle.sys.packages.DbmsXplan; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; public class DBMS_XPLAN { @@ -51,7 +51,7 @@ public class DBMS_XPLAN { Class.forName("oracle.jdbc.OracleDriver"); Connection connection = DriverManager.getConnection("jdbc:oracle:thin:@localhost:1521:xe", "TEST", "TEST"); - DSLContext ora = Factory.using(connection, SQLDialect.ORACLE); + DSLContext ora = DSL.using(connection, SQLDialect.ORACLE); ora.fetch("select * from t_book b join t_author a on b.author_id = a.id"); // TODO [#1113] This doesn't work yet diff --git a/jOOQ-test/examples/org/jooq/examples/Library.java b/jOOQ-test/examples/org/jooq/examples/Library.java index 9c56b972fa..361a772b6a 100644 --- a/jOOQ-test/examples/org/jooq/examples/Library.java +++ b/jOOQ-test/examples/org/jooq/examples/Library.java @@ -35,8 +35,8 @@ */ package org.jooq.examples; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectDistinct; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectDistinct; import static org.jooq.test.mysql.generatedclasses.Keys.FK_T_BOOK_AUTHOR_ID; import static org.jooq.test.mysql.generatedclasses.Tables.T_LANGUAGE; import static org.jooq.test.mysql.generatedclasses.tables.TAuthor.T_AUTHOR; @@ -51,7 +51,7 @@ import org.jooq.Result; import org.jooq.SQLDialect; import org.jooq.Select; import org.jooq.SelectQuery; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test.mysql.generatedclasses.enums.TBookStatus; import org.jooq.test.mysql.generatedclasses.tables.TAuthor; import org.jooq.test.mysql.generatedclasses.tables.TBook; @@ -62,7 +62,7 @@ import org.jooq.test.mysql.generatedclasses.tables.records.TBookRecord; public class Library { private static DSLContext create() throws Exception { - return Factory.using(getConnection(), SQLDialect.MYSQL); + return DSL.using(getConnection(), SQLDialect.MYSQL); } public static void main(String[] args) throws Exception { diff --git a/jOOQ-test/examples/org/jooq/examples/Sakila.java b/jOOQ-test/examples/org/jooq/examples/Sakila.java index 109f335a8e..a59b6033e0 100644 --- a/jOOQ-test/examples/org/jooq/examples/Sakila.java +++ b/jOOQ-test/examples/org/jooq/examples/Sakila.java @@ -45,7 +45,7 @@ import java.sql.DriverManager; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; public class Sakila { @@ -53,7 +53,7 @@ public class Sakila { Class.forName("com.mysql.jdbc.Driver"); Connection connection = DriverManager.getConnection("jdbc:mysql://localhost/sakila", "root", ""); - DSLContext create = Factory.using(connection, SQLDialect.MYSQL); + DSLContext create = DSL.using(connection, SQLDialect.MYSQL); System.out.println(create .select() diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/AWBuildVersion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/AWBuildVersion.java index 832332dda7..7d59ac141d 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/AWBuildVersion.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/AWBuildVersion.java @@ -95,7 +95,7 @@ public class AWBuildVersion extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class AWBuildVersion extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/DatabaseLog.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/DatabaseLog.java index 545bfeb683..5e9f6fee58 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/DatabaseLog.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/DatabaseLog.java @@ -155,7 +155,7 @@ public class DatabaseLog extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); } /** @@ -163,7 +163,7 @@ public class DatabaseLog extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/ErrorLog.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/ErrorLog.java index 57144b5530..979f30ba8e 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/ErrorLog.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/dbo/tables/records/ErrorLog.java @@ -170,7 +170,7 @@ public class ErrorLog extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -178,7 +178,7 @@ public class ErrorLog extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Department.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Department.java index 57b24d83b7..f42e6b4b8a 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Department.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Department.java @@ -95,7 +95,7 @@ public class Department extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class Department extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Employee.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Employee.java index 7538525009..a89d80fcd9 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Employee.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Employee.java @@ -275,7 +275,7 @@ public class Employee extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); } /** @@ -283,7 +283,7 @@ public class Employee extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeAddress.java index e90662d1d6..a7deff6b50 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeAddress.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeAddress.java @@ -96,7 +96,7 @@ public class EmployeeAddress extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class EmployeeAddress extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeDepartmentHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeDepartmentHistory.java index 563c6ca833..e85222a725 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeDepartmentHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeeDepartmentHistory.java @@ -126,7 +126,7 @@ public class EmployeeDepartmentHistory extends org.jooq.impl.UpdatableRecordImpl */ @Override public org.jooq.Row6 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -134,7 +134,7 @@ public class EmployeeDepartmentHistory extends org.jooq.impl.UpdatableRecordImpl */ @Override public org.jooq.Row6 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeePayHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeePayHistory.java index da06f59202..3ef11f9567 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeePayHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/EmployeePayHistory.java @@ -111,7 +111,7 @@ public class EmployeePayHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class EmployeePayHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/JobCandidate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/JobCandidate.java index a36795588f..3e58d9bb95 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/JobCandidate.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/JobCandidate.java @@ -95,7 +95,7 @@ public class JobCandidate extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class JobCandidate extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Shift.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Shift.java index 9cc19aca11..cd548d0349 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Shift.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/Shift.java @@ -110,7 +110,7 @@ public class Shift extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -118,7 +118,7 @@ public class Shift extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployee.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployee.java index 339d7117c2..3d04832f2d 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployee.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployee.java @@ -277,7 +277,7 @@ public class vEmployee extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); } /** @@ -285,7 +285,7 @@ public class vEmployee extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartment.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartment.java index 0a383c09cc..eb6a0ef18b 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartment.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartment.java @@ -172,7 +172,7 @@ public class vEmployeeDepartment extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); } /** @@ -180,7 +180,7 @@ public class vEmployeeDepartment extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartmentHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartmentHistory.java index bfcafb0f3c..d0adcaafff 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartmentHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vEmployeeDepartmentHistory.java @@ -187,7 +187,7 @@ public class vEmployeeDepartmentHistory extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -195,7 +195,7 @@ public class vEmployeeDepartmentHistory extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidate.java index cefbe7f8e3..b1da4a1400 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidate.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidate.java @@ -262,7 +262,7 @@ public class vJobCandidate extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); } /** @@ -270,7 +270,7 @@ public class vJobCandidate extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEducation.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEducation.java index 693f9b1def..3048319041 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEducation.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEducation.java @@ -217,7 +217,7 @@ public class vJobCandidateEducation extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); } /** @@ -225,7 +225,7 @@ public class vJobCandidateEducation extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEmployment.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEmployment.java index b26c79494e..42ebddb520 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEmployment.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/humanresources/tables/records/vJobCandidateEmployment.java @@ -187,7 +187,7 @@ public class vJobCandidateEmployment extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -195,7 +195,7 @@ public class vJobCandidateEmployment extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Address.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Address.java index d0a7a18903..acb27e37b5 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Address.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Address.java @@ -155,7 +155,7 @@ public class Address extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); } /** @@ -163,7 +163,7 @@ public class Address extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/AddressType.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/AddressType.java index 0a0ccd4bc8..35cdb4b14a 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/AddressType.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/AddressType.java @@ -95,7 +95,7 @@ public class AddressType extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class AddressType extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Contact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Contact.java index 1389683cf5..1e56206917 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Contact.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/Contact.java @@ -260,7 +260,7 @@ public class Contact extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15()); } /** @@ -268,7 +268,7 @@ public class Contact extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/ContactType.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/ContactType.java index 61d60c1d46..a141f63ddd 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/ContactType.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/ContactType.java @@ -80,7 +80,7 @@ public class ContactType extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class ContactType extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/CountryRegion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/CountryRegion.java index e0fa2f7694..f2fb62ed10 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/CountryRegion.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/CountryRegion.java @@ -80,7 +80,7 @@ public class CountryRegion extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class CountryRegion extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/StateProvince.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/StateProvince.java index 03d9d2c69a..1f3169cd34 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/StateProvince.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/StateProvince.java @@ -155,7 +155,7 @@ public class StateProvince extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); } /** @@ -163,7 +163,7 @@ public class StateProvince extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vAdditionalContactInfo.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vAdditionalContactInfo.java index b25696a0e4..212d6a1df7 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vAdditionalContactInfo.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vAdditionalContactInfo.java @@ -277,7 +277,7 @@ public class vAdditionalContactInfo extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); } /** @@ -285,7 +285,7 @@ public class vAdditionalContactInfo extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vStateProvinceCountryRegion.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vStateProvinceCountryRegion.java index b377ebb848..498dacbdff 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vStateProvinceCountryRegion.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/person/tables/records/vStateProvinceCountryRegion.java @@ -127,7 +127,7 @@ public class vStateProvinceCountryRegion extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); } /** @@ -135,7 +135,7 @@ public class vStateProvinceCountryRegion extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/BillOfMaterials.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/BillOfMaterials.java index 228af15e8a..a73fe3979c 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/BillOfMaterials.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/BillOfMaterials.java @@ -170,7 +170,7 @@ public class BillOfMaterials extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -178,7 +178,7 @@ public class BillOfMaterials extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Culture.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Culture.java index c4fecae40e..f2088c52c7 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Culture.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Culture.java @@ -80,7 +80,7 @@ public class Culture extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class Culture extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Document.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Document.java index 637c05c0a3..a255d99d72 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Document.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Document.java @@ -185,7 +185,7 @@ public class Document extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); } /** @@ -193,7 +193,7 @@ public class Document extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Illustration.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Illustration.java index c6ea87371a..950745bff8 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Illustration.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Illustration.java @@ -80,7 +80,7 @@ public class Illustration extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class Illustration extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Location.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Location.java index 19d16622a5..54e8e39678 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Location.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/Location.java @@ -110,7 +110,7 @@ public class Location extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -118,7 +118,7 @@ public class Location extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCategory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCategory.java index 774aa311d2..ef58e7bdbc 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCategory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCategory.java @@ -95,7 +95,7 @@ public class ProductCategory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class ProductCategory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCostHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCostHistory.java index be74ce5373..b3d30889b5 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCostHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductCostHistory.java @@ -111,7 +111,7 @@ public class ProductCostHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class ProductCostHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDescription.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDescription.java index d533444d74..da1fcf06fb 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDescription.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDescription.java @@ -95,7 +95,7 @@ public class ProductDescription extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class ProductDescription extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDocument.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDocument.java index 3fb9f9e80b..6383629ad2 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDocument.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductDocument.java @@ -81,7 +81,7 @@ public class ProductDocument extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -89,7 +89,7 @@ public class ProductDocument extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductInventory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductInventory.java index e478fb3031..83cc73420a 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductInventory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductInventory.java @@ -141,7 +141,7 @@ public class ProductInventory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); } /** @@ -149,7 +149,7 @@ public class ProductInventory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductListPriceHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductListPriceHistory.java index 0ea4f43e6c..6ddeb7d279 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductListPriceHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductListPriceHistory.java @@ -111,7 +111,7 @@ public class ProductListPriceHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class ProductListPriceHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModel.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModel.java index 00e73efe32..b0a55bb553 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModel.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModel.java @@ -125,7 +125,7 @@ public class ProductModel extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class ProductModel extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelIllustration.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelIllustration.java index 7ecd1e4e77..cc7ba6c46e 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelIllustration.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelIllustration.java @@ -81,7 +81,7 @@ public class ProductModelIllustration extends org.jooq.impl.UpdatableRecordImpl< */ @Override public org.jooq.Row3 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -89,7 +89,7 @@ public class ProductModelIllustration extends org.jooq.impl.UpdatableRecordImpl< */ @Override public org.jooq.Row3 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelProductDescriptionCulture.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelProductDescriptionCulture.java index 8201f0226d..f86cbfbe01 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelProductDescriptionCulture.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductModelProductDescriptionCulture.java @@ -96,7 +96,7 @@ public class ProductModelProductDescriptionCulture extends org.jooq.impl.Updatab */ @Override public org.jooq.Row4 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class ProductModelProductDescriptionCulture extends org.jooq.impl.Updatab */ @Override public org.jooq.Row4 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductPhoto.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductPhoto.java index 564c9490ca..56ca561199 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductPhoto.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductPhoto.java @@ -125,7 +125,7 @@ public class ProductPhoto extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class ProductPhoto extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductProductPhoto.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductProductPhoto.java index b8880fba6a..52b7ade06b 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductProductPhoto.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductProductPhoto.java @@ -96,7 +96,7 @@ public class ProductProductPhoto extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class ProductProductPhoto extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductReview.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductReview.java index c70da45cf6..b6f0537232 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductReview.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductReview.java @@ -155,7 +155,7 @@ public class ProductReview extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); } /** @@ -163,7 +163,7 @@ public class ProductReview extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductSubcategory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductSubcategory.java index a6514dfc4b..4c8734d4d3 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductSubcategory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ProductSubcategory.java @@ -110,7 +110,7 @@ public class ProductSubcategory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -118,7 +118,7 @@ public class ProductSubcategory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ScrapReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ScrapReason.java index e86746f6aa..b29f37c485 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ScrapReason.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/ScrapReason.java @@ -80,7 +80,7 @@ public class ScrapReason extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class ScrapReason extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistory.java index ccddfdd821..d743cbe6eb 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistory.java @@ -170,7 +170,7 @@ public class TransactionHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -178,7 +178,7 @@ public class TransactionHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistoryArchive.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistoryArchive.java index 02e84e6fd9..02a448dffe 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistoryArchive.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/TransactionHistoryArchive.java @@ -170,7 +170,7 @@ public class TransactionHistoryArchive extends org.jooq.impl.UpdatableRecordImpl */ @Override public org.jooq.Row9 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -178,7 +178,7 @@ public class TransactionHistoryArchive extends org.jooq.impl.UpdatableRecordImpl */ @Override public org.jooq.Row9 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/UnitMeasure.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/UnitMeasure.java index 989fc15d76..ecc4efea68 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/UnitMeasure.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/UnitMeasure.java @@ -80,7 +80,7 @@ public class UnitMeasure extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class UnitMeasure extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrder.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrder.java index 0e21d47e1e..728aec63c8 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrder.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrder.java @@ -185,7 +185,7 @@ public class WorkOrder extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); } /** @@ -193,7 +193,7 @@ public class WorkOrder extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrderRouting.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrderRouting.java index 0550991c45..28dee87ca2 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrderRouting.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/WorkOrderRouting.java @@ -216,7 +216,7 @@ public class WorkOrderRouting extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12()); } /** @@ -224,7 +224,7 @@ public class WorkOrderRouting extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductAndDescription.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductAndDescription.java index bb30108952..c22c0a7a96 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductAndDescription.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductAndDescription.java @@ -97,7 +97,7 @@ public class vProductAndDescription extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -105,7 +105,7 @@ public class vProductAndDescription extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductModelInstructions.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductModelInstructions.java index 5b615ed8c4..284169f71b 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductModelInstructions.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/production/tables/records/vProductModelInstructions.java @@ -187,7 +187,7 @@ public class vProductModelInstructions extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -195,7 +195,7 @@ public class vProductModelInstructions extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ProductVendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ProductVendor.java index 741bd17417..407b163a4d 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ProductVendor.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ProductVendor.java @@ -201,7 +201,7 @@ public class ProductVendor extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -209,7 +209,7 @@ public class ProductVendor extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderDetail.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderDetail.java index 40a3713ee9..496ae48a8a 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderDetail.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderDetail.java @@ -201,7 +201,7 @@ public class PurchaseOrderDetail extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -209,7 +209,7 @@ public class PurchaseOrderDetail extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderHeader.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderHeader.java index ca0d600781..0413fb8a65 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderHeader.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/PurchaseOrderHeader.java @@ -230,7 +230,7 @@ public class PurchaseOrderHeader extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); } /** @@ -238,7 +238,7 @@ public class PurchaseOrderHeader extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ShipMethod.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ShipMethod.java index b431ebbc7d..4367ba3db8 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ShipMethod.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/ShipMethod.java @@ -125,7 +125,7 @@ public class ShipMethod extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class ShipMethod extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/Vendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/Vendor.java index a5f80e362c..d04394f598 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/Vendor.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/Vendor.java @@ -155,7 +155,7 @@ public class Vendor extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8()); } /** @@ -163,7 +163,7 @@ public class Vendor extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorAddress.java index e5ddca0fc0..58cb86e3c2 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorAddress.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorAddress.java @@ -96,7 +96,7 @@ public class VendorAddress extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class VendorAddress extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorContact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorContact.java index 0742d1ff50..71375ed0cf 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorContact.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/VendorContact.java @@ -96,7 +96,7 @@ public class VendorContact extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class VendorContact extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/vVendor.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/vVendor.java index 707f9bfd0c..a64e7ad370 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/vVendor.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/purchasing/tables/records/vVendor.java @@ -277,7 +277,7 @@ public class vVendor extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); } /** @@ -285,7 +285,7 @@ public class vVendor extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ContactCreditCard.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ContactCreditCard.java index b75305edc0..9d7746a156 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ContactCreditCard.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ContactCreditCard.java @@ -81,7 +81,7 @@ public class ContactCreditCard extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -89,7 +89,7 @@ public class ContactCreditCard extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CountryRegionCurrency.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CountryRegionCurrency.java index 3922039030..8aad8c8350 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CountryRegionCurrency.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CountryRegionCurrency.java @@ -81,7 +81,7 @@ public class CountryRegionCurrency extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -89,7 +89,7 @@ public class CountryRegionCurrency extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CreditCard.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CreditCard.java index ab9a0745c5..1b2acf4271 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CreditCard.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CreditCard.java @@ -125,7 +125,7 @@ public class CreditCard extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class CreditCard extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Currency.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Currency.java index 8ae610272a..d2b411d62d 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Currency.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Currency.java @@ -80,7 +80,7 @@ public class Currency extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -88,7 +88,7 @@ public class Currency extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CurrencyRate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CurrencyRate.java index c50362d14b..7f1cff4ec1 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CurrencyRate.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CurrencyRate.java @@ -140,7 +140,7 @@ public class CurrencyRate extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); } /** @@ -148,7 +148,7 @@ public class CurrencyRate extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Customer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Customer.java index f180f623a5..0fab1832bc 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Customer.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Customer.java @@ -125,7 +125,7 @@ public class Customer extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class Customer extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CustomerAddress.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CustomerAddress.java index f644d87837..65a98e0c78 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CustomerAddress.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/CustomerAddress.java @@ -111,7 +111,7 @@ public class CustomerAddress extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class CustomerAddress extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Individual.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Individual.java index 90c8266d09..8cdcfaca09 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Individual.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Individual.java @@ -95,7 +95,7 @@ public class Individual extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class Individual extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderDetail.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderDetail.java index b9a44f8dd0..b68167fce5 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderDetail.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderDetail.java @@ -201,7 +201,7 @@ public class SalesOrderDetail extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -209,7 +209,7 @@ public class SalesOrderDetail extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderHeaderSalesReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderHeaderSalesReason.java index b9da363212..984bc520ee 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderHeaderSalesReason.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesOrderHeaderSalesReason.java @@ -81,7 +81,7 @@ public class SalesOrderHeaderSalesReason extends org.jooq.impl.UpdatableRecordIm */ @Override public org.jooq.Row3 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -89,7 +89,7 @@ public class SalesOrderHeaderSalesReason extends org.jooq.impl.UpdatableRecordIm */ @Override public org.jooq.Row3 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPerson.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPerson.java index 290c9b46ec..54ae6f4f6c 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPerson.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPerson.java @@ -170,7 +170,7 @@ public class SalesPerson extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -178,7 +178,7 @@ public class SalesPerson extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPersonQuotaHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPersonQuotaHistory.java index c4cd056cfa..a87a5b4f31 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPersonQuotaHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesPersonQuotaHistory.java @@ -111,7 +111,7 @@ public class SalesPersonQuotaHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class SalesPersonQuotaHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesReason.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesReason.java index 2b045826fc..e15043123b 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesReason.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesReason.java @@ -95,7 +95,7 @@ public class SalesReason extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -103,7 +103,7 @@ public class SalesReason extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTaxRate.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTaxRate.java index ae2b058fe5..e67cdbfd84 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTaxRate.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTaxRate.java @@ -140,7 +140,7 @@ public class SalesTaxRate extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); } /** @@ -148,7 +148,7 @@ public class SalesTaxRate extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritory.java index b340475de0..0edbeffc81 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritory.java @@ -185,7 +185,7 @@ public class SalesTerritory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10()); } /** @@ -193,7 +193,7 @@ public class SalesTerritory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritoryHistory.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritoryHistory.java index d2a047b610..06651fc2ca 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritoryHistory.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SalesTerritoryHistory.java @@ -126,7 +126,7 @@ public class SalesTerritoryHistory extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -134,7 +134,7 @@ public class SalesTerritoryHistory extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ShoppingCartItem.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ShoppingCartItem.java index 0d7129a1a7..94ae3c4035 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ShoppingCartItem.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/ShoppingCartItem.java @@ -125,7 +125,7 @@ public class ShoppingCartItem extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class ShoppingCartItem extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOffer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOffer.java index 4679ae6b76..a4b0a28c30 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOffer.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOffer.java @@ -200,7 +200,7 @@ public class SpecialOffer extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -208,7 +208,7 @@ public class SpecialOffer extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOfferProduct.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOfferProduct.java index 2482e2fe05..e081507ceb 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOfferProduct.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/SpecialOfferProduct.java @@ -96,7 +96,7 @@ public class SpecialOfferProduct extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -104,7 +104,7 @@ public class SpecialOfferProduct extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Store.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Store.java index ae7c99aede..f0cc01c1e1 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Store.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/Store.java @@ -125,7 +125,7 @@ public class Store extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -133,7 +133,7 @@ public class Store extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/StoreContact.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/StoreContact.java index 4faf249f62..f8f3c91f0a 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/StoreContact.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/StoreContact.java @@ -111,7 +111,7 @@ public class StoreContact extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5()); } /** @@ -119,7 +119,7 @@ public class StoreContact extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualCustomer.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualCustomer.java index 7937b2e540..fefd051687 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualCustomer.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualCustomer.java @@ -277,7 +277,7 @@ public class vIndividualCustomer extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17()); } /** @@ -285,7 +285,7 @@ public class vIndividualCustomer extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualDemographics.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualDemographics.java index 0b9d3feea8..11ad34b218 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualDemographics.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vIndividualDemographics.java @@ -217,7 +217,7 @@ public class vIndividualDemographics extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); } /** @@ -225,7 +225,7 @@ public class vIndividualDemographics extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPerson.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPerson.java index c63b0b0713..3c8e419605 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPerson.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPerson.java @@ -337,7 +337,7 @@ public class vSalesPerson extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17(), field18(), field19(), field20(), field21()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16(), field17(), field18(), field19(), field20(), field21()); } /** @@ -345,7 +345,7 @@ public class vSalesPerson extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17(), value18(), value19(), value20(), value21()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16(), value17(), value18(), value19(), value20(), value21()); } /** diff --git a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPersonSalesByFiscalYears.java b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPersonSalesByFiscalYears.java index 486cf813ea..97d276ce97 100644 --- a/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPersonSalesByFiscalYears.java +++ b/jOOQ-test/examples/org/jooq/examples/sqlserver/adventureworks/sales/tables/records/vSalesPersonSalesByFiscalYears.java @@ -127,7 +127,7 @@ public class vSalesPersonSalesByFiscalYears extends org.jooq.impl.TableRecordImp */ @Override public org.jooq.Row7 fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7()); } /** @@ -135,7 +135,7 @@ public class vSalesPersonSalesByFiscalYears extends org.jooq.impl.TableRecordImp */ @Override public org.jooq.Row7 valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ASETest.java b/jOOQ-test/src/org/jooq/test/ASETest.java index b36eef2b92..c644f07361 100644 --- a/jOOQ-test/src/org/jooq/test/ASETest.java +++ b/jOOQ-test/src/org/jooq/test/ASETest.java @@ -56,7 +56,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -126,7 +126,7 @@ public class ASETest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.ASE, settings); + return DSL.using(getConnection(), SQLDialect.ASE, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java index 5a231bfd2b..f4ef3b651d 100644 --- a/jOOQ-test/src/org/jooq/test/CUBRIDTest.java +++ b/jOOQ-test/src/org/jooq/test/CUBRIDTest.java @@ -31,6 +31,7 @@ package org.jooq.test; +import static org.jooq.impl.DSL.using; import static org.jooq.test.cubrid.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE; import static org.jooq.test.cubrid.generatedclasses.Tables.T_BOOLEANS; import static org.jooq.test.cubrid.generatedclasses.Tables.T_DATES; @@ -58,7 +59,6 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -133,7 +133,7 @@ public class CUBRIDTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.CUBRID, settings); + return using(getConnection(), SQLDialect.CUBRID, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/DB2Test.java b/jOOQ-test/src/org/jooq/test/DB2Test.java index 9590b7da4e..bf68f4ab13 100644 --- a/jOOQ-test/src/org/jooq/test/DB2Test.java +++ b/jOOQ-test/src/org/jooq/test/DB2Test.java @@ -61,7 +61,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -133,7 +133,7 @@ public class DB2Test extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.DB2, settings); + return DSL.using(getConnection(), SQLDialect.DB2, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/DerbyTest.java b/jOOQ-test/src/org/jooq/test/DerbyTest.java index 1077813723..20fc284c60 100644 --- a/jOOQ-test/src/org/jooq/test/DerbyTest.java +++ b/jOOQ-test/src/org/jooq/test/DerbyTest.java @@ -63,7 +63,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -133,7 +133,7 @@ public class DerbyTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.DERBY, settings); + return DSL.using(getConnection(), SQLDialect.DERBY, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/FirebirdTest.java b/jOOQ-test/src/org/jooq/test/FirebirdTest.java index 21ebb173a5..5a8219a9a8 100644 --- a/jOOQ-test/src/org/jooq/test/FirebirdTest.java +++ b/jOOQ-test/src/org/jooq/test/FirebirdTest.java @@ -68,7 +68,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -125,7 +125,7 @@ public class FirebirdTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.FIREBIRD, settings); + return DSL.using(getConnection(), SQLDialect.FIREBIRD, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/H2Test.java b/jOOQ-test/src/org/jooq/test/H2Test.java index 052e9bf786..fd0de9f726 100644 --- a/jOOQ-test/src/org/jooq/test/H2Test.java +++ b/jOOQ-test/src/org/jooq/test/H2Test.java @@ -52,8 +52,8 @@ import java.sql.Timestamp; import java.util.UUID; import org.jooq.ArrayRecord; -import org.jooq.DSLContext; import org.jooq.DAO; +import org.jooq.DSLContext; import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; @@ -64,7 +64,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -141,7 +141,7 @@ public class H2Test extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.H2, settings); + return DSL.using(getConnection(), SQLDialect.H2, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java index 35ac1801b7..9869ab927e 100644 --- a/jOOQ-test/src/org/jooq/test/HSQLDBTest.java +++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest.java @@ -72,7 +72,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -131,7 +131,7 @@ public class HSQLDBTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.HSQLDB, settings); + return DSL.using(getConnection(), SQLDialect.HSQLDB, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java index 2f7a00b6eb..17e2ca7c95 100644 --- a/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java +++ b/jOOQ-test/src/org/jooq/test/HSQLDBTest2.java @@ -72,7 +72,7 @@ import org.jooq.conf.MappedSchema; import org.jooq.conf.RenderMapping; import org.jooq.conf.Settings; import org.jooq.conf.SettingsTools; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -145,7 +145,7 @@ public class HSQLDBTest2 extends jOOQAbstractTest< .withOutput(Public.PUBLIC.getName()); } - return Factory.using(getConnection(), SQLDialect.HSQLDB, settings); + return DSL.using(getConnection(), SQLDialect.HSQLDB, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/IngresTest.java b/jOOQ-test/src/org/jooq/test/IngresTest.java index d0baefd5a5..a8a7841a05 100644 --- a/jOOQ-test/src/org/jooq/test/IngresTest.java +++ b/jOOQ-test/src/org/jooq/test/IngresTest.java @@ -61,7 +61,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -130,7 +130,7 @@ public class IngresTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.INGRES, settings); + return DSL.using(getConnection(), SQLDialect.INGRES, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/MySQLTest.java b/jOOQ-test/src/org/jooq/test/MySQLTest.java index f2484a754b..63cb4886bf 100644 --- a/jOOQ-test/src/org/jooq/test/MySQLTest.java +++ b/jOOQ-test/src/org/jooq/test/MySQLTest.java @@ -37,8 +37,8 @@ package org.jooq.test; import static junit.framework.Assert.assertNull; -import static org.jooq.impl.Factory.md5; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.md5; +import static org.jooq.impl.DSL.val; import static org.jooq.test.mysql.generatedclasses.Tables.T_BOOK_TO_BOOK_STORE; import static org.jooq.test.mysql.generatedclasses.Tables.T_BOOLEANS; import static org.jooq.test.mysql.generatedclasses.Tables.T_DATES; @@ -69,8 +69,8 @@ import java.util.List; import java.util.UUID; import org.jooq.ArrayRecord; -import org.jooq.DSLContext; import org.jooq.DAO; +import org.jooq.DSLContext; import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; @@ -81,7 +81,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -159,7 +159,7 @@ public class MySQLTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.MYSQL, settings); + return DSL.using(getConnection(), SQLDialect.MYSQL, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java index c189f3112b..5463714824 100644 --- a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java +++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaMapping.java @@ -44,7 +44,7 @@ import org.jooq.conf.MappedSchema; import org.jooq.conf.RenderMapping; import org.jooq.conf.Settings; import org.jooq.conf.SettingsTools; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; /** @@ -81,6 +81,6 @@ public class MySQLTestSchemaMapping extends MySQLTest { .withOutput(TAuthor().getSchema().getName() + getSchemaSuffix()); } - return Factory.using(getConnection(), SQLDialect.MYSQL, settings); + return DSL.using(getConnection(), SQLDialect.MYSQL, settings); } } \ No newline at end of file diff --git a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java index 18ca0f7898..e56439ff3a 100644 --- a/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java +++ b/jOOQ-test/src/org/jooq/test/MySQLTestSchemaRewrite.java @@ -70,7 +70,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -133,7 +133,7 @@ public class MySQLTestSchemaRewrite extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.MYSQL, settings); + return DSL.using(getConnection(), SQLDialect.MYSQL, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/OracleTest.java b/jOOQ-test/src/org/jooq/test/OracleTest.java index 5a410fedb4..010eb4b10f 100644 --- a/jOOQ-test/src/org/jooq/test/OracleTest.java +++ b/jOOQ-test/src/org/jooq/test/OracleTest.java @@ -41,10 +41,10 @@ import static java.util.Collections.emptyList; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; -import static org.jooq.impl.Factory.currentUser; -import static org.jooq.impl.Factory.sum; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.currentUser; +import static org.jooq.impl.DSL.sum; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.val; import static org.jooq.test.oracle.generatedclasses.multi_schema.Tables.T_BOOK_SALE; import static org.jooq.test.oracle.generatedclasses.test.Routines.f691cursorIn; import static org.jooq.test.oracle.generatedclasses.test.Routines.f691cursorOut; @@ -92,8 +92,8 @@ import java.util.List; import java.util.UUID; import org.jooq.ArrayRecord; -import org.jooq.DSLContext; import org.jooq.DAO; +import org.jooq.DSLContext; import org.jooq.DataType; import org.jooq.Field; import org.jooq.ForeignKey; @@ -107,7 +107,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -215,7 +215,7 @@ public class OracleTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.ORACLE, settings); + return DSL.using(getConnection(), SQLDialect.ORACLE, settings); } @Override @@ -1333,7 +1333,7 @@ public class OracleTest extends jOOQAbstractTest< @Test public void testOracleMultiSchemaFactories() throws Exception { - DSLContext create = Factory.using(getConnectionMultiSchema(), SQLDialect.ORACLE); + DSLContext create = DSL.using(getConnectionMultiSchema(), SQLDialect.ORACLE); UAddressTypeRecord address = new UAddressTypeRecord(); address.setStreet(new UStreetTypeRecord()); diff --git a/jOOQ-test/src/org/jooq/test/OracleTestInline.java b/jOOQ-test/src/org/jooq/test/OracleTestInline.java index 2e1a141734..fb3136cdea 100644 --- a/jOOQ-test/src/org/jooq/test/OracleTestInline.java +++ b/jOOQ-test/src/org/jooq/test/OracleTestInline.java @@ -40,7 +40,7 @@ import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.jooq.conf.Settings; import org.jooq.conf.StatementType; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; /** @@ -53,6 +53,6 @@ public class OracleTestInline extends OracleTest { settings = (settings != null) ? settings : new Settings(); settings.withStatementType(StatementType.STATIC_STATEMENT); settings.withRenderFormatted(true); - return Factory.using(getConnection(), SQLDialect.ORACLE, settings); + return DSL.using(getConnection(), SQLDialect.ORACLE, settings); } } \ No newline at end of file diff --git a/jOOQ-test/src/org/jooq/test/PostgresTest.java b/jOOQ-test/src/org/jooq/test/PostgresTest.java index 22b5bc4afd..c772ae1136 100644 --- a/jOOQ-test/src/org/jooq/test/PostgresTest.java +++ b/jOOQ-test/src/org/jooq/test/PostgresTest.java @@ -36,7 +36,7 @@ package org.jooq.test; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.val; import static org.jooq.test.postgres.generatedclasses.Routines.fSearchBook; import static org.jooq.test.postgres.generatedclasses.Tables.T_639_NUMBERS_TABLE; import static org.jooq.test.postgres.generatedclasses.Tables.T_725_LOB_TEST; @@ -78,7 +78,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -149,7 +149,7 @@ public class PostgresTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.POSTGRES, settings); + return DSL.using(getConnection(), SQLDialect.POSTGRES, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTest.java b/jOOQ-test/src/org/jooq/test/SQLServerTest.java index b6dcf6f28c..d00d802298 100644 --- a/jOOQ-test/src/org/jooq/test/SQLServerTest.java +++ b/jOOQ-test/src/org/jooq/test/SQLServerTest.java @@ -70,7 +70,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -127,7 +127,7 @@ public class SQLServerTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.SQLSERVER, settings); + return DSL.using(getConnection(), SQLDialect.SQLSERVER, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java index ab4d46f15c..2c02d4d463 100644 --- a/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java +++ b/jOOQ-test/src/org/jooq/test/SQLServerTestInline.java @@ -40,7 +40,7 @@ import org.jooq.DSLContext; import org.jooq.SQLDialect; import org.jooq.conf.Settings; import org.jooq.conf.StatementType; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; /** @@ -52,6 +52,6 @@ public class SQLServerTestInline extends SQLServerTest { protected DSLContext create(Settings settings) { settings = (settings != null) ? settings : new Settings(); settings.withStatementType(StatementType.STATIC_STATEMENT); - return Factory.using(getConnection(), SQLDialect.SQLSERVER, settings); + return DSL.using(getConnection(), SQLDialect.SQLSERVER, settings); } } \ No newline at end of file diff --git a/jOOQ-test/src/org/jooq/test/SQLiteTest.java b/jOOQ-test/src/org/jooq/test/SQLiteTest.java index 9d504a8864..45d28ad234 100644 --- a/jOOQ-test/src/org/jooq/test/SQLiteTest.java +++ b/jOOQ-test/src/org/jooq/test/SQLiteTest.java @@ -60,7 +60,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -127,7 +127,7 @@ public class SQLiteTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.SQLITE, settings); + return DSL.using(getConnection(), SQLDialect.SQLITE, settings); } @Override diff --git a/jOOQ-test/src/org/jooq/test/SybaseTest.java b/jOOQ-test/src/org/jooq/test/SybaseTest.java index 77e76a09a3..0461cc8fc6 100644 --- a/jOOQ-test/src/org/jooq/test/SybaseTest.java +++ b/jOOQ-test/src/org/jooq/test/SybaseTest.java @@ -65,7 +65,7 @@ import org.jooq.Table; import org.jooq.TableField; import org.jooq.UDTRecord; import org.jooq.conf.Settings; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.converters.Boolean_10; import org.jooq.test._.converters.Boolean_TF_LC; import org.jooq.test._.converters.Boolean_TF_UC; @@ -127,7 +127,7 @@ public class SybaseTest extends jOOQAbstractTest< @Override protected DSLContext create(Settings settings) { - return Factory.using(getConnection(), SQLDialect.SYBASE, settings); + return DSL.using(getConnection(), SQLDialect.SYBASE, settings); } diff --git a/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java b/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java index db21489429..e773bb2892 100644 --- a/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java +++ b/jOOQ-test/src/org/jooq/test/_/PrettyPrinter.java @@ -40,8 +40,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.jooq.DSLContext; import org.jooq.ExecuteContext; import org.jooq.conf.SettingsTools; +import org.jooq.impl.DSL; import org.jooq.impl.DefaultExecuteListener; -import org.jooq.impl.Factory; import org.jooq.tools.StringUtils; /** @@ -66,12 +66,12 @@ public class PrettyPrinter extends DefaultExecuteListener { // Create a new factory for logging rendering purposes // This factory doesn't need a connection, only the SQLDialect... - DSLContext pretty = Factory.using(ctx.configuration().getDialect(), + DSLContext pretty = DSL.using(ctx.configuration().getDialect(), // ... and the flag for pretty-printing SettingsTools.clone(ctx.configuration().getSettings()).withRenderFormatted(true)); - DSLContext normal = Factory.using(ctx.configuration().getDialect()); + DSLContext normal = DSL.using(ctx.configuration().getDialect()); String n = "" + count.incrementAndGet(); diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java index 5ccdcdfec2..88d8f6f4e9 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/AggregateWindowFunctionTests.java @@ -51,47 +51,47 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; -import static org.jooq.impl.Factory.avg; -import static org.jooq.impl.Factory.avgDistinct; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.countDistinct; -import static org.jooq.impl.Factory.cumeDist; -import static org.jooq.impl.Factory.denseRank; -import static org.jooq.impl.Factory.firstValue; -import static org.jooq.impl.Factory.groupConcat; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.lag; -import static org.jooq.impl.Factory.lead; -import static org.jooq.impl.Factory.listAgg; -import static org.jooq.impl.Factory.max; -import static org.jooq.impl.Factory.maxDistinct; -import static org.jooq.impl.Factory.median; -import static org.jooq.impl.Factory.min; -import static org.jooq.impl.Factory.minDistinct; -import static org.jooq.impl.Factory.ntile; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.percentRank; -import static org.jooq.impl.Factory.rank; -import static org.jooq.impl.Factory.regrAvgX; -import static org.jooq.impl.Factory.regrAvgY; -import static org.jooq.impl.Factory.regrCount; -import static org.jooq.impl.Factory.regrIntercept; -import static org.jooq.impl.Factory.regrR2; -import static org.jooq.impl.Factory.regrSXX; -import static org.jooq.impl.Factory.regrSXY; -import static org.jooq.impl.Factory.regrSYY; -import static org.jooq.impl.Factory.regrSlope; -import static org.jooq.impl.Factory.rowNumber; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectDistinct; -import static org.jooq.impl.Factory.selectFrom; -import static org.jooq.impl.Factory.stddevPop; -import static org.jooq.impl.Factory.stddevSamp; -import static org.jooq.impl.Factory.sum; -import static org.jooq.impl.Factory.sumDistinct; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.varPop; -import static org.jooq.impl.Factory.varSamp; +import static org.jooq.impl.DSL.avg; +import static org.jooq.impl.DSL.avgDistinct; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.countDistinct; +import static org.jooq.impl.DSL.cumeDist; +import static org.jooq.impl.DSL.denseRank; +import static org.jooq.impl.DSL.firstValue; +import static org.jooq.impl.DSL.groupConcat; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.lag; +import static org.jooq.impl.DSL.lead; +import static org.jooq.impl.DSL.listAgg; +import static org.jooq.impl.DSL.max; +import static org.jooq.impl.DSL.maxDistinct; +import static org.jooq.impl.DSL.median; +import static org.jooq.impl.DSL.min; +import static org.jooq.impl.DSL.minDistinct; +import static org.jooq.impl.DSL.ntile; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.percentRank; +import static org.jooq.impl.DSL.rank; +import static org.jooq.impl.DSL.regrAvgX; +import static org.jooq.impl.DSL.regrAvgY; +import static org.jooq.impl.DSL.regrCount; +import static org.jooq.impl.DSL.regrIntercept; +import static org.jooq.impl.DSL.regrR2; +import static org.jooq.impl.DSL.regrSXX; +import static org.jooq.impl.DSL.regrSXY; +import static org.jooq.impl.DSL.regrSYY; +import static org.jooq.impl.DSL.regrSlope; +import static org.jooq.impl.DSL.rowNumber; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectDistinct; +import static org.jooq.impl.DSL.selectFrom; +import static org.jooq.impl.DSL.stddevPop; +import static org.jooq.impl.DSL.stddevSamp; +import static org.jooq.impl.DSL.sum; +import static org.jooq.impl.DSL.sumDistinct; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.varPop; +import static org.jooq.impl.DSL.varSamp; import java.math.BigDecimal; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java index 9d86320325..d4919c45f5 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/AliasTests.java @@ -37,12 +37,12 @@ package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNull; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.selectZero; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.two; -import static org.jooq.impl.Factory.zero; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.selectZero; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.two; +import static org.jooq.impl.DSL.zero; import java.sql.Date; import java.util.List; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java index 300d1e2387..8859f09c67 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/CRUDTests.java @@ -42,8 +42,8 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.jooq.SQLDialect.SQLITE; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.table; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.table; import java.sql.Date; import java.sql.Timestamp; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java index eeb835b41a..fabec28c56 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/DataTypeTests.java @@ -52,15 +52,15 @@ import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; import static org.jooq.conf.StatementType.STATIC_STATEMENT; -import static org.jooq.impl.Factory.cast; -import static org.jooq.impl.Factory.castNull; -import static org.jooq.impl.Factory.dateAdd; -import static org.jooq.impl.Factory.dateDiff; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.timestampAdd; -import static org.jooq.impl.Factory.timestampDiff; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.cast; +import static org.jooq.impl.DSL.castNull; +import static org.jooq.impl.DSL.dateAdd; +import static org.jooq.impl.DSL.dateDiff; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.timestampAdd; +import static org.jooq.impl.DSL.timestampDiff; +import static org.jooq.impl.DSL.val; import static org.jooq.types.Unsigned.ubyte; import static org.jooq.types.Unsigned.uint; import static org.jooq.types.Unsigned.ulong; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java index 468c9ccc7b..368b09de5a 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExecuteListenerTests.java @@ -43,8 +43,8 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.jooq.conf.SettingsTools.executePreparedStatements; -import static org.jooq.impl.Factory.param; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.param; +import static org.jooq.impl.DSL.val; import java.sql.Date; import java.util.ArrayList; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java index 7ff958a601..0da1fcd1b9 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ExoticTests.java @@ -38,26 +38,26 @@ package org.jooq.test._.testcases; import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; -import static org.jooq.impl.Factory.avg; -import static org.jooq.impl.Factory.connectByIsCycle; -import static org.jooq.impl.Factory.connectByIsLeaf; -import static org.jooq.impl.Factory.connectByRoot; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.fieldByName; -import static org.jooq.impl.Factory.level; -import static org.jooq.impl.Factory.lower; -import static org.jooq.impl.Factory.max; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.prior; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.substring; -import static org.jooq.impl.Factory.sum; -import static org.jooq.impl.Factory.sysConnectByPath; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.trueCondition; -import static org.jooq.impl.Factory.two; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.avg; +import static org.jooq.impl.DSL.connectByIsCycle; +import static org.jooq.impl.DSL.connectByIsLeaf; +import static org.jooq.impl.DSL.connectByRoot; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.fieldByName; +import static org.jooq.impl.DSL.level; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.max; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.prior; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.substring; +import static org.jooq.impl.DSL.sum; +import static org.jooq.impl.DSL.sysConnectByPath; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.trueCondition; +import static org.jooq.impl.DSL.two; +import static org.jooq.impl.DSL.val; import static org.jooq.util.oracle.OracleFactory.rownum; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java index 525295dcba..c3823c3d90 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FetchTests.java @@ -45,9 +45,9 @@ import static junit.framework.Assert.fail; import static org.jooq.SQLDialect.H2; import static org.jooq.SQLDialect.ORACLE; import static org.jooq.SQLDialect.POSTGRES; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.val; import static org.jooq.tools.reflect.Reflect.on; import java.math.BigDecimal; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java index b713c3cb86..b9a0c1f573 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/FunctionTests.java @@ -44,82 +44,82 @@ import static org.jooq.SQLDialect.DB2; import static org.jooq.SQLDialect.INGRES; import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; -import static org.jooq.impl.Factory.abs; -import static org.jooq.impl.Factory.acos; -import static org.jooq.impl.Factory.ascii; -import static org.jooq.impl.Factory.asin; -import static org.jooq.impl.Factory.atan; -import static org.jooq.impl.Factory.atan2; -import static org.jooq.impl.Factory.bitAnd; -import static org.jooq.impl.Factory.bitCount; -import static org.jooq.impl.Factory.bitLength; -import static org.jooq.impl.Factory.bitNand; -import static org.jooq.impl.Factory.bitNor; -import static org.jooq.impl.Factory.bitNot; -import static org.jooq.impl.Factory.bitOr; -import static org.jooq.impl.Factory.bitXNor; -import static org.jooq.impl.Factory.bitXor; -import static org.jooq.impl.Factory.castNull; -import static org.jooq.impl.Factory.ceil; -import static org.jooq.impl.Factory.charLength; -import static org.jooq.impl.Factory.coalesce; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.cos; -import static org.jooq.impl.Factory.cosh; -import static org.jooq.impl.Factory.cot; -import static org.jooq.impl.Factory.coth; -import static org.jooq.impl.Factory.currentDate; -import static org.jooq.impl.Factory.currentTime; -import static org.jooq.impl.Factory.currentTimestamp; -import static org.jooq.impl.Factory.currentUser; -import static org.jooq.impl.Factory.day; -import static org.jooq.impl.Factory.decode; -import static org.jooq.impl.Factory.deg; -import static org.jooq.impl.Factory.exp; -import static org.jooq.impl.Factory.extract; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.floor; -import static org.jooq.impl.Factory.greatest; -import static org.jooq.impl.Factory.hour; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.least; -import static org.jooq.impl.Factory.length; -import static org.jooq.impl.Factory.ln; -import static org.jooq.impl.Factory.log; -import static org.jooq.impl.Factory.lower; -import static org.jooq.impl.Factory.lpad; -import static org.jooq.impl.Factory.ltrim; -import static org.jooq.impl.Factory.md5; -import static org.jooq.impl.Factory.minute; -import static org.jooq.impl.Factory.month; -import static org.jooq.impl.Factory.nullif; -import static org.jooq.impl.Factory.nvl; -import static org.jooq.impl.Factory.nvl2; -import static org.jooq.impl.Factory.octetLength; -import static org.jooq.impl.Factory.position; -import static org.jooq.impl.Factory.power; -import static org.jooq.impl.Factory.rad; -import static org.jooq.impl.Factory.rand; -import static org.jooq.impl.Factory.repeat; -import static org.jooq.impl.Factory.replace; -import static org.jooq.impl.Factory.round; -import static org.jooq.impl.Factory.rpad; -import static org.jooq.impl.Factory.rtrim; -import static org.jooq.impl.Factory.second; -import static org.jooq.impl.Factory.shl; -import static org.jooq.impl.Factory.shr; -import static org.jooq.impl.Factory.sign; -import static org.jooq.impl.Factory.sin; -import static org.jooq.impl.Factory.sinh; -import static org.jooq.impl.Factory.sqrt; -import static org.jooq.impl.Factory.substring; -import static org.jooq.impl.Factory.tan; -import static org.jooq.impl.Factory.tanh; -import static org.jooq.impl.Factory.trim; -import static org.jooq.impl.Factory.trunc; -import static org.jooq.impl.Factory.upper; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.year; +import static org.jooq.impl.DSL.abs; +import static org.jooq.impl.DSL.acos; +import static org.jooq.impl.DSL.ascii; +import static org.jooq.impl.DSL.asin; +import static org.jooq.impl.DSL.atan; +import static org.jooq.impl.DSL.atan2; +import static org.jooq.impl.DSL.bitAnd; +import static org.jooq.impl.DSL.bitCount; +import static org.jooq.impl.DSL.bitLength; +import static org.jooq.impl.DSL.bitNand; +import static org.jooq.impl.DSL.bitNor; +import static org.jooq.impl.DSL.bitNot; +import static org.jooq.impl.DSL.bitOr; +import static org.jooq.impl.DSL.bitXNor; +import static org.jooq.impl.DSL.bitXor; +import static org.jooq.impl.DSL.castNull; +import static org.jooq.impl.DSL.ceil; +import static org.jooq.impl.DSL.charLength; +import static org.jooq.impl.DSL.coalesce; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.cos; +import static org.jooq.impl.DSL.cosh; +import static org.jooq.impl.DSL.cot; +import static org.jooq.impl.DSL.coth; +import static org.jooq.impl.DSL.currentDate; +import static org.jooq.impl.DSL.currentTime; +import static org.jooq.impl.DSL.currentTimestamp; +import static org.jooq.impl.DSL.currentUser; +import static org.jooq.impl.DSL.day; +import static org.jooq.impl.DSL.decode; +import static org.jooq.impl.DSL.deg; +import static org.jooq.impl.DSL.exp; +import static org.jooq.impl.DSL.extract; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.floor; +import static org.jooq.impl.DSL.greatest; +import static org.jooq.impl.DSL.hour; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.least; +import static org.jooq.impl.DSL.length; +import static org.jooq.impl.DSL.ln; +import static org.jooq.impl.DSL.log; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.lpad; +import static org.jooq.impl.DSL.ltrim; +import static org.jooq.impl.DSL.md5; +import static org.jooq.impl.DSL.minute; +import static org.jooq.impl.DSL.month; +import static org.jooq.impl.DSL.nullif; +import static org.jooq.impl.DSL.nvl; +import static org.jooq.impl.DSL.nvl2; +import static org.jooq.impl.DSL.octetLength; +import static org.jooq.impl.DSL.position; +import static org.jooq.impl.DSL.power; +import static org.jooq.impl.DSL.rad; +import static org.jooq.impl.DSL.rand; +import static org.jooq.impl.DSL.repeat; +import static org.jooq.impl.DSL.replace; +import static org.jooq.impl.DSL.round; +import static org.jooq.impl.DSL.rpad; +import static org.jooq.impl.DSL.rtrim; +import static org.jooq.impl.DSL.second; +import static org.jooq.impl.DSL.shl; +import static org.jooq.impl.DSL.shr; +import static org.jooq.impl.DSL.sign; +import static org.jooq.impl.DSL.sin; +import static org.jooq.impl.DSL.sinh; +import static org.jooq.impl.DSL.sqrt; +import static org.jooq.impl.DSL.substring; +import static org.jooq.impl.DSL.tan; +import static org.jooq.impl.DSL.tanh; +import static org.jooq.impl.DSL.trim; +import static org.jooq.impl.DSL.trunc; +import static org.jooq.impl.DSL.upper; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.year; import java.math.BigDecimal; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java index 83f163e7a9..e857e59861 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/GeneralTests.java @@ -41,17 +41,17 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.fail; -import static org.jooq.impl.Factory.castNull; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.deg; -import static org.jooq.impl.Factory.e; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.pi; -import static org.jooq.impl.Factory.rad; -import static org.jooq.impl.Factory.trim; -import static org.jooq.impl.Factory.two; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.zero; +import static org.jooq.impl.DSL.castNull; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.deg; +import static org.jooq.impl.DSL.e; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.pi; +import static org.jooq.impl.DSL.rad; +import static org.jooq.impl.DSL.trim; +import static org.jooq.impl.DSL.two; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.zero; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java index 9f5f4edf93..239703be99 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/GroupByTests.java @@ -40,14 +40,14 @@ import static junit.framework.Assert.assertEquals; import static org.jooq.SQLDialect.DB2; import static org.jooq.SQLDialect.MYSQL; import static org.jooq.SQLDialect.SYBASE; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.cube; -import static org.jooq.impl.Factory.grouping; -import static org.jooq.impl.Factory.groupingId; -import static org.jooq.impl.Factory.groupingSets; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.rollup; -import static org.jooq.impl.Factory.selectOne; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.cube; +import static org.jooq.impl.DSL.grouping; +import static org.jooq.impl.DSL.groupingId; +import static org.jooq.impl.DSL.groupingSets; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.rollup; +import static org.jooq.impl.DSL.selectOne; import java.sql.Date; import java.util.Arrays; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java index 8f4e81c7b8..65e8d56a7b 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/InsertUpdateTests.java @@ -52,20 +52,20 @@ import static org.jooq.SQLDialect.POSTGRES; import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; -import static org.jooq.impl.Factory.cast; -import static org.jooq.impl.Factory.castNull; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.decode; -import static org.jooq.impl.Factory.falseCondition; -import static org.jooq.impl.Factory.fieldByName; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.max; -import static org.jooq.impl.Factory.row; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.tableByName; -import static org.jooq.impl.Factory.trueCondition; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.cast; +import static org.jooq.impl.DSL.castNull; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.decode; +import static org.jooq.impl.DSL.falseCondition; +import static org.jooq.impl.DSL.fieldByName; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.max; +import static org.jooq.impl.DSL.row; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.tableByName; +import static org.jooq.impl.DSL.trueCondition; +import static org.jooq.impl.DSL.val; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java index 36b1f7d0c9..723a3765de 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/JoinTests.java @@ -44,15 +44,15 @@ import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DB2; import static org.jooq.SQLDialect.INGRES; import static org.jooq.SQLDialect.SQLITE; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.falseCondition; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.lower; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.zero; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.falseCondition; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.zero; import java.sql.Date; import java.util.List; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java index 5831103127..4d8a7e00c7 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/LoaderTests.java @@ -39,7 +39,7 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static org.jooq.SQLDialect.ORACLE; -import static org.jooq.impl.Factory.count; +import static org.jooq.impl.DSL.count; import java.sql.Date; import java.sql.SQLException; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java index 7934deceaa..4db405268e 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/OrderByTests.java @@ -45,12 +45,12 @@ import static org.jooq.SQLDialect.HSQLDB; import static org.jooq.SQLDialect.INGRES; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.lower; -import static org.jooq.impl.Factory.param; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.param; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.val; import java.sql.Date; import java.util.Arrays; @@ -70,7 +70,7 @@ import org.jooq.Select; import org.jooq.Table; import org.jooq.TableRecord; import org.jooq.UpdatableRecord; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test.BaseTest; import org.jooq.test.jOOQAbstractTest; @@ -374,7 +374,7 @@ extends BaseTest s2 = Factory.select().limit(1).offset(2); + Select s2 = DSL.select().limit(1).offset(2); assertSame(asList(1, 2), s2.getBindValues()); assertSame(asList(val(1), val(2)), s2.getParams().values()); } diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java index 1739d37024..11dd1d080c 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/PlainSQLTests.java @@ -43,15 +43,15 @@ import static junit.framework.Assert.assertTrue; import static org.jooq.SQLDialect.FIREBIRD; import static org.jooq.SQLDialect.H2; import static org.jooq.conf.StatementType.STATIC_STATEMENT; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.fieldByName; -import static org.jooq.impl.Factory.function; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.name; -import static org.jooq.impl.Factory.param; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.tableByName; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.fieldByName; +import static org.jooq.impl.DSL.function; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.name; +import static org.jooq.impl.DSL.param; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.tableByName; +import static org.jooq.impl.DSL.val; import java.sql.Date; import java.sql.SQLException; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java index f26e39d37b..238d205d7e 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/PredicateTests.java @@ -41,21 +41,21 @@ import static org.jooq.SQLDialect.ASE; import static org.jooq.SQLDialect.DB2; import static org.jooq.SQLDialect.DERBY; import static org.jooq.conf.StatementType.STATIC_STATEMENT; -import static org.jooq.impl.Factory.all; -import static org.jooq.impl.Factory.any; -import static org.jooq.impl.Factory.castNull; -import static org.jooq.impl.Factory.concat; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.escape; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.lower; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.trueCondition; -import static org.jooq.impl.Factory.upper; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.zero; +import static org.jooq.impl.DSL.all; +import static org.jooq.impl.DSL.any; +import static org.jooq.impl.DSL.castNull; +import static org.jooq.impl.DSL.concat; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.escape; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.lower; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.trueCondition; +import static org.jooq.impl.DSL.upper; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.zero; import java.sql.Date; import java.util.ArrayList; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java index 1f3382a52e..c381bad2f9 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/RenderAndBindTests.java @@ -43,10 +43,10 @@ import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.jooq.SQLDialect.DERBY; import static org.jooq.conf.SettingsTools.executePreparedStatements; -import static org.jooq.impl.Factory.field; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.param; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.field; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.param; +import static org.jooq.impl.DSL.val; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java index bf73aeb500..bf46141f91 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/RoutineAndUDTTests.java @@ -41,8 +41,8 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import static org.jooq.impl.Factory.table; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.table; +import static org.jooq.impl.DSL.val; import static org.jooq.tools.reflect.Reflect.on; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java index d40b081ecd..3dfde520a7 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/RowValueExpressionTests.java @@ -47,15 +47,15 @@ import static org.jooq.SQLDialect.ORACLE; import static org.jooq.SQLDialect.SQLITE; import static org.jooq.SQLDialect.SQLSERVER; import static org.jooq.SQLDialect.SYBASE; -import static org.jooq.impl.Factory.currentDate; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.not; -import static org.jooq.impl.Factory.one; -import static org.jooq.impl.Factory.row; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.trueCondition; -import static org.jooq.impl.Factory.val; -import static org.jooq.impl.Factory.zero; +import static org.jooq.impl.DSL.currentDate; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.not; +import static org.jooq.impl.DSL.one; +import static org.jooq.impl.DSL.row; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.trueCondition; +import static org.jooq.impl.DSL.val; +import static org.jooq.impl.DSL.zero; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java index d12055515a..02af258c85 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/SchemaAndMappingTests.java @@ -40,8 +40,8 @@ import static java.util.Collections.nCopies; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.sum; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.sum; import java.math.BigDecimal; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java index f220a79f8d..12c0ce9dc1 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/SelectTests.java @@ -39,13 +39,13 @@ import static java.util.Arrays.asList; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import static org.jooq.SQLDialect.ORACLE; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.countDistinct; -import static org.jooq.impl.Factory.select; -import static org.jooq.impl.Factory.selectOne; -import static org.jooq.impl.Factory.selectZero; -import static org.jooq.impl.Factory.trim; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.countDistinct; +import static org.jooq.impl.DSL.select; +import static org.jooq.impl.DSL.selectOne; +import static org.jooq.impl.DSL.selectZero; +import static org.jooq.impl.DSL.trim; +import static org.jooq.impl.DSL.val; import java.sql.Date; import java.util.Vector; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java index c1462d81d0..450f7707f4 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/StatementTests.java @@ -40,8 +40,8 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; import static org.jooq.SQLDialect.H2; -import static org.jooq.impl.Factory.inline; -import static org.jooq.impl.Factory.val; +import static org.jooq.impl.DSL.inline; +import static org.jooq.impl.DSL.val; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java index fb41e28479..3c8d3061a4 100644 --- a/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java +++ b/jOOQ-test/src/org/jooq/test/_/testcases/ValuesConstructorTests.java @@ -36,8 +36,8 @@ package org.jooq.test._.testcases; import static junit.framework.Assert.assertEquals; -import static org.jooq.impl.Factory.row; -import static org.jooq.impl.Factory.values; +import static org.jooq.impl.DSL.row; +import static org.jooq.impl.DSL.values; import java.sql.Date; diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TAuthorRecord.java index 2f16dc95e2..4b15df150c 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TAuthorRecord.java @@ -139,7 +139,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -147,7 +147,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookStoreRecord.java index 594a83d2c2..9c098b4d49 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookStoreRecord.java @@ -51,7 +51,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -59,7 +59,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookToBookStoreRecord.java index 692c4a176b..fec00e42e0 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookToBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TBookToBookStoreRecord.java @@ -163,7 +163,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -171,7 +171,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TDatesRecord.java index 6b7cc551ff..ab5798f343 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TDatesRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TDatesRecord.java @@ -115,7 +115,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -123,7 +123,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java index b1c3fe5cc8..9b02d01a4c 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityPkRecord.java @@ -59,7 +59,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -67,7 +67,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java index 876f2b7c79..3be2a77e32 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TIdentityRecord.java @@ -55,7 +55,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -63,7 +63,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TLanguageRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TLanguageRecord.java index 34b51f2285..376b094de9 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TLanguageRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TLanguageRecord.java @@ -99,7 +99,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -107,7 +107,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TTriggersRecord.java index bcef7fc2fc..3e29570367 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TTriggersRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/TTriggersRecord.java @@ -73,7 +73,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -81,7 +81,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_725LobTestRecord.java index 8a3cafa0db..f0dca39376 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_725LobTestRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_725LobTestRecord.java @@ -59,7 +59,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -67,7 +67,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_785Record.java index 70c036659c..564363178a 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_785Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_785Record.java @@ -69,7 +69,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -77,7 +77,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_1Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_1Record.java index bee06a7254..aaf5878be7 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_1Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_1Record.java @@ -45,7 +45,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -53,7 +53,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_2Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_2Record.java index d6b00e0d5b..2fcba78206 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_2Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/T_986_2Record.java @@ -45,7 +45,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -53,7 +53,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VAuthorRecord.java index 138ed7c15d..a923881166 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VAuthorRecord.java @@ -111,7 +111,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -119,7 +119,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VLibraryRecord.java index f64bb6fe6a..d0f660576c 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VLibraryRecord.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/VLibraryRecord.java @@ -55,7 +55,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -63,7 +63,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_64_69Record.java index 16a7bfe64b..934b922b11 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_64_69Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_64_69Record.java @@ -112,7 +112,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -120,7 +120,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_71Record.java index b31603c20b..ce2a007beb 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_71Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_71Record.java @@ -100,7 +100,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -108,7 +108,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_85Record.java index 4f40cbca29..948f9d7371 100644 --- a/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_85Record.java +++ b/jOOQ-test/src/org/jooq/test/ase/generatedclasses/tables/records/XTestCase_85Record.java @@ -114,7 +114,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -122,7 +122,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TAuthorRecord.java index 83ec2440de..4d57225241 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TAuthorRecord.java @@ -116,7 +116,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -124,7 +124,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookRecord.java index 451dfacf2b..af241dc961 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookRecord.java @@ -158,7 +158,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -166,7 +166,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookStoreRecord.java index 03e83d09d1..bf791a8653 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookStoreRecord.java @@ -46,7 +46,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -54,7 +54,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookToBookStoreRecord.java index 8e581f817d..f0d153d236 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookToBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBookToBookStoreRecord.java @@ -74,7 +74,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -82,7 +82,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java index 0b0a6309fd..b549a92cf4 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TBooleansRecord.java @@ -186,7 +186,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -194,7 +194,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TDatesRecord.java index 5ea7c7031c..dc57b23387 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TDatesRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TDatesRecord.java @@ -116,7 +116,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -124,7 +124,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java index 4a156fc7da..197fb82636 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityPkRecord.java @@ -60,7 +60,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -68,7 +68,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java index 84ebd41d37..b590a99b06 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TIdentityRecord.java @@ -48,7 +48,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -56,7 +56,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TLanguageRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TLanguageRecord.java index 1e4074e43e..b6376cd291 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TLanguageRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TLanguageRecord.java @@ -88,7 +88,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -96,7 +96,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TTriggersRecord.java index 3e65cc3f8f..de9e3cb145 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TTriggersRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/TTriggersRecord.java @@ -74,7 +74,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -82,7 +82,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_639NumbersTableRecord.java index a0fc57f6c3..908efb1084 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_639NumbersTableRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_639NumbersTableRecord.java @@ -200,7 +200,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12()); } /** @@ -208,7 +208,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_725LobTestRecord.java index 7d8c3d2f4b..7d53e485b2 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_725LobTestRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_725LobTestRecord.java @@ -60,7 +60,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -68,7 +68,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_785Record.java index 936a77f349..3f44c1be70 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_785Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_785Record.java @@ -62,7 +62,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -70,7 +70,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_1Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_1Record.java index f790960705..3a93e2614a 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_1Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_1Record.java @@ -46,7 +46,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -54,7 +54,7 @@ public class T_986_1Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_2Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_2Record.java index b1998a6854..eafd155b0f 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_2Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/T_986_2Record.java @@ -46,7 +46,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -54,7 +54,7 @@ public class T_986_2Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VAuthorRecord.java index 5aceac40b6..7b242a8ed0 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VAuthorRecord.java @@ -104,7 +104,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -112,7 +112,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VBookRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VBookRecord.java index f6285738e8..c3d41cd94b 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VBookRecord.java @@ -146,7 +146,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -154,7 +154,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VLibraryRecord.java index 4a96ab3f22..0bc1b3f416 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VLibraryRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/VLibraryRecord.java @@ -48,7 +48,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -56,7 +56,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_2025Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_2025Record.java index 257606c3a2..4c8381e817 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_2025Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_2025Record.java @@ -48,7 +48,7 @@ public class XTestCase_2025Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -56,7 +56,7 @@ public class XTestCase_2025Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_64_69Record.java index d6f62d0a4f..528a4e097a 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_64_69Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_64_69Record.java @@ -60,7 +60,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -68,7 +68,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_71Record.java index 1841544db9..32d174a91c 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_71Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_71Record.java @@ -60,7 +60,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -68,7 +68,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_85Record.java index 41c71d66be..ee15199179 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_85Record.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XTestCase_85Record.java @@ -74,7 +74,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -82,7 +82,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java index f37a9654e6..0cc9fee6ea 100644 --- a/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java +++ b/jOOQ-test/src/org/jooq/test/db2/generatedclasses/tables/records/XUnusedRecord.java @@ -256,7 +256,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); } /** @@ -264,7 +264,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); } /** diff --git a/jOOQ-test/src/org/jooq/test/h2/F.java b/jOOQ-test/src/org/jooq/test/h2/F.java index 4175ffd44f..72daaa338c 100644 --- a/jOOQ-test/src/org/jooq/test/h2/F.java +++ b/jOOQ-test/src/org/jooq/test/h2/F.java @@ -35,9 +35,9 @@ */ package org.jooq.test.h2; -import static org.jooq.impl.Factory.count; -import static org.jooq.impl.Factory.max; -import static org.jooq.impl.Factory.sign; +import static org.jooq.impl.DSL.count; +import static org.jooq.impl.DSL.max; +import static org.jooq.impl.DSL.sign; import static org.jooq.impl.SQLDataType.INTEGER; import static org.jooq.test.h2.generatedclasses.tables.TAuthor.T_AUTHOR; import static org.jooq.test.h2.generatedclasses.tables.TBook.T_BOOK; @@ -49,7 +49,7 @@ import java.sql.SQLException; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test.h2.generatedclasses.Routines; import org.jooq.test.h2.generatedclasses.tables.TAuthor; import org.jooq.test.h2.generatedclasses.tables.TBook; @@ -139,6 +139,6 @@ public class F { } private static DSLContext create(Connection connection) { - return Factory.using(connection, SQLDialect.H2); + return DSL.using(connection, SQLDialect.H2); } } diff --git a/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java b/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java index 204a68e563..38b19f3ccd 100644 --- a/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java +++ b/jOOQ-test/src/org/jooq/test/h2/TTriggersTrigger.java @@ -40,7 +40,7 @@ import java.sql.SQLException; import org.jooq.DSLContext; import org.jooq.SQLDialect; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test.h2.generatedclasses.Sequences; import org.h2.api.Trigger; @@ -58,7 +58,7 @@ public class TTriggersTrigger implements Trigger { @Override public void fire(Connection conn, Object[] oldRow, Object[] newRow) throws SQLException { - DSLContext create = Factory.using(conn, SQLDialect.H2); + DSLContext create = DSL.using(conn, SQLDialect.H2); int maxID = create.nextval(Sequences.S_TRIGGERS_SEQUENCE).intValue(); newRow[0] = maxID; newRow[1] = maxID; diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java index 7454126fe0..6e09a60bad 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TAuthorRecord.java @@ -142,7 +142,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -150,7 +150,7 @@ public class TAuthorRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookRecord.java index 55a8f16fe5..05ddb7c7d7 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookRecord.java @@ -240,7 +240,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -248,7 +248,7 @@ public class TBookRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookStoreRecord.java index fad167bf85..6e3eff5eee 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookStoreRecord.java @@ -62,7 +62,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -70,7 +70,7 @@ public class TBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookToBookStoreRecord.java index 18a4122d80..65a799f546 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookToBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBookToBookStoreRecord.java @@ -124,7 +124,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -132,7 +132,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java index 5987e2b689..8264d948d2 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TBooleansRecord.java @@ -190,7 +190,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -198,7 +198,7 @@ public class TBooleansRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TDatesRecord.java index 6369f69ed9..de49207154 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TDatesRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TDatesRecord.java @@ -120,7 +120,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -128,7 +128,7 @@ public class TDatesRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java index 0c082f0edf..732d0539ca 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityPkRecord.java @@ -64,7 +64,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -72,7 +72,7 @@ public class TIdentityPkRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java index 02963b59a4..5e01eae726 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TIdentityRecord.java @@ -52,7 +52,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -60,7 +60,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TLanguageRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TLanguageRecord.java index 2d5b9ddee1..9185ce9378 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TLanguageRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TLanguageRecord.java @@ -104,7 +104,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -112,7 +112,7 @@ public class TLanguageRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TTriggersRecord.java index 03ed69218b..e3b2367584 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TTriggersRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/TTriggersRecord.java @@ -78,7 +78,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -86,7 +86,7 @@ public class TTriggersRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_639NumbersTableRecord.java index 72fd71ed64..818ecf2e8f 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_639NumbersTableRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_639NumbersTableRecord.java @@ -218,7 +218,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); } /** @@ -226,7 +226,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_725LobTestRecord.java index b2366c9ae1..8209a127cd 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_725LobTestRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_725LobTestRecord.java @@ -64,7 +64,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -72,7 +72,7 @@ public class T_725LobTestRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_785Record.java index 56687dd3f7..a8f14b47b1 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_785Record.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/T_785Record.java @@ -66,7 +66,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -74,7 +74,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VAuthorRecord.java index 7664b37573..a461bbef4e 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VAuthorRecord.java @@ -108,7 +108,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -116,7 +116,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VBookRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VBookRecord.java index 507b3bd59b..fb1d98b209 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VBookRecord.java @@ -150,7 +150,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9()); } /** @@ -158,7 +158,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VLibraryRecord.java index 1ab3f9407d..20429ed00b 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VLibraryRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/VLibraryRecord.java @@ -52,7 +52,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -60,7 +60,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_64_69Record.java index d159c9965a..cf4e5246bb 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_64_69Record.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_64_69Record.java @@ -96,7 +96,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -104,7 +104,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_71Record.java index 9fb69fa3b3..c8feb2bed1 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_71Record.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_71Record.java @@ -86,7 +86,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -94,7 +94,7 @@ public class XTestCase_71Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_85Record.java index 76f1088f44..a0da055ad6 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_85Record.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XTestCase_85Record.java @@ -89,7 +89,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -97,7 +97,7 @@ public class XTestCase_85Record extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java index 6f0bf4af9c..10e68144dc 100644 --- a/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java +++ b/jOOQ-test/src/org/jooq/test/ingres/generatedclasses/tables/records/XUnusedRecord.java @@ -277,7 +277,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14()); } /** @@ -285,7 +285,7 @@ public class XUnusedRecord extends org.jooq.impl.UpdatableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java index e7823b9a58..1cbcaa521c 100644 --- a/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java +++ b/jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java @@ -63,8 +63,8 @@ import java.util.UUID; import javax.swing.UIManager; import org.jooq.ArrayRecord; -import org.jooq.DSLContext; import org.jooq.DAO; +import org.jooq.DSLContext; import org.jooq.DataType; import org.jooq.ExecuteType; import org.jooq.Field; @@ -89,7 +89,7 @@ import org.jooq.conf.SettingsTools; import org.jooq.debug.Debugger; import org.jooq.debug.console.Console; import org.jooq.debug.impl.DebuggerFactory; -import org.jooq.impl.Factory; +import org.jooq.impl.DSL; import org.jooq.test._.LifecycleWatcherListener; import org.jooq.test._.PrettyPrinter; import org.jooq.test._.TestStatisticsListener; @@ -492,7 +492,7 @@ public abstract class jOOQAbstractTest< @Override public MockResult[] execute(MockExecuteContext context) throws SQLException { - DSLContext executor = Factory.using(c, getDialect()); + DSLContext executor = DSL.using(c, getDialect()); if (context.batchSingle()) { Query query = executor.query(context.sql(), new Object[context.batchBindings()[0].length]); diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TArraysRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TArraysRecord.java index bfd616bf19..75f13d68d0 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TArraysRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TArraysRecord.java @@ -88,7 +88,7 @@ public class TArraysRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -96,7 +96,7 @@ public class TArraysRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TAuthorRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TAuthorRecord.java index b5dd423491..47fcdbe536 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TAuthorRecord.java @@ -120,7 +120,7 @@ public class TAuthorRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -128,7 +128,7 @@ public class TAuthorRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookRecord.java index a2286fcb23..4551fb43ee 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookRecord.java @@ -200,7 +200,7 @@ public class TBookRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -208,7 +208,7 @@ public class TBookRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookStoreRecord.java index 16d9bac0d9..4578e02bf8 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookStoreRecord.java @@ -40,7 +40,7 @@ public class TBookStoreRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -48,7 +48,7 @@ public class TBookStoreRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookToBookStoreRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookToBookStoreRecord.java index bdb80ce3fc..ddf916c9cc 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookToBookStoreRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBookToBookStoreRecord.java @@ -72,7 +72,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -80,7 +80,7 @@ public class TBookToBookStoreRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBooleansRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBooleansRecord.java index ebcbf96d01..6b7b171bd1 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBooleansRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TBooleansRecord.java @@ -200,7 +200,7 @@ public class TBooleansRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -208,7 +208,7 @@ public class TBooleansRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TDatesRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TDatesRecord.java index 62d17e3472..191834ec2a 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TDatesRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TDatesRecord.java @@ -120,7 +120,7 @@ public class TDatesRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -128,7 +128,7 @@ public class TDatesRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityPkRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityPkRecord.java index dfb308d829..fe0992d138 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityPkRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityPkRecord.java @@ -56,7 +56,7 @@ public class TIdentityPkRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class TIdentityPkRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityRecord.java index 399f23149c..8bee45499b 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TIdentityRecord.java @@ -56,7 +56,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class TIdentityRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TLanguageRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TLanguageRecord.java index 97cebb20f3..e5d63de10c 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TLanguageRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TLanguageRecord.java @@ -88,7 +88,7 @@ public class TLanguageRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4()); } /** @@ -96,7 +96,7 @@ public class TLanguageRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TTriggersRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TTriggersRecord.java index 6c9100e669..d9651e6bef 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TTriggersRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/TTriggersRecord.java @@ -72,7 +72,7 @@ public class TTriggersRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -80,7 +80,7 @@ public class TTriggersRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java index 9ad08f80f6..7ecbf5c95e 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_639NumbersTableRecord.java @@ -232,7 +232,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13()); } /** @@ -240,7 +240,7 @@ public class T_639NumbersTableRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_725LobTestRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_725LobTestRecord.java index 99888df303..233c0ba886 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_725LobTestRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_725LobTestRecord.java @@ -56,7 +56,7 @@ public class T_725LobTestRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class T_725LobTestRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_785Record.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_785Record.java index bb956adaa4..335f6cc015 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_785Record.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_785Record.java @@ -72,7 +72,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -80,7 +80,7 @@ public class T_785Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_877Record.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_877Record.java index f1e63af46c..5e16473cb0 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_877Record.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/T_877Record.java @@ -40,7 +40,7 @@ public class T_877Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1()); + return org.jooq.impl.DSL.row(field1()); } /** @@ -48,7 +48,7 @@ public class T_877Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1()); + return org.jooq.impl.DSL.row(value1()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VAuthorRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VAuthorRecord.java index 65184422c0..71b9867811 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VAuthorRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VAuthorRecord.java @@ -120,7 +120,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6()); } /** @@ -128,7 +128,7 @@ public class VAuthorRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VBookRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VBookRecord.java index 0e4b856976..247b2b1a23 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VBookRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VBookRecord.java @@ -200,7 +200,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11()); } /** @@ -208,7 +208,7 @@ public class VBookRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VLibraryRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VLibraryRecord.java index e8b0dca4b4..b7a95efaaa 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VLibraryRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/VLibraryRecord.java @@ -56,7 +56,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class VLibraryRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_64_69Record.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_64_69Record.java index db0c8232ab..d2bce7502a 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_64_69Record.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_64_69Record.java @@ -56,7 +56,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class XTestCase_64_69Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_71Record.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_71Record.java index de3e2a7306..bfe2449277 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_71Record.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_71Record.java @@ -56,7 +56,7 @@ public class XTestCase_71Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2()); + return org.jooq.impl.DSL.row(field1(), field2()); } /** @@ -64,7 +64,7 @@ public class XTestCase_71Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2()); + return org.jooq.impl.DSL.row(value1(), value2()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_85Record.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_85Record.java index abfda1cb76..7b7b82ef2d 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_85Record.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XTestCase_85Record.java @@ -72,7 +72,7 @@ public class XTestCase_85Record extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3()); + return org.jooq.impl.DSL.row(field1(), field2(), field3()); } /** @@ -80,7 +80,7 @@ public class XTestCase_85Record extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3()); + return org.jooq.impl.DSL.row(value1(), value2(), value3()); } /** diff --git a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java index 2dd674c279..80a574992a 100644 --- a/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java +++ b/jOOQ-test/src/org/jooq/test/jdbc/generatedclasses/tables/records/XUnusedRecord.java @@ -280,7 +280,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl fieldsRow() { - return org.jooq.impl.Factory.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); + return org.jooq.impl.DSL.row(field1(), field2(), field3(), field4(), field5(), field6(), field7(), field8(), field9(), field10(), field11(), field12(), field13(), field14(), field15(), field16()); } /** @@ -288,7 +288,7 @@ public class XUnusedRecord extends org.jooq.impl.TableRecordImpl valuesRow() { - return org.jooq.impl.Factory.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); + return org.jooq.impl.DSL.row(value1(), value2(), value3(), value4(), value5(), value6(), value7(), value8(), value9(), value10(), value11(), value12(), value13(), value14(), value15(), value16()); } /** diff --git a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend index 2f75de3b1d..c8b630adc9 100644 --- a/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend +++ b/jOOQ-tools/src/org/jooq/xtend/BetweenAndSteps.xtend @@ -108,7 +108,7 @@ class BetweenAndSteps extends Generators { package org.jooq.impl; import static java.util.Arrays.asList; - import static org.jooq.impl.Factory.row; + import static org.jooq.impl.DSL.row; import static org.jooq.SQLDialect.ASE; import static org.jooq.SQLDialect.CUBRID; import static org.jooq.SQLDialect.DB2; diff --git a/jOOQ-tools/src/org/jooq/xtend/Factory.xtend b/jOOQ-tools/src/org/jooq/xtend/Factory.xtend index 516052ce0c..8b7f625fb7 100644 --- a/jOOQ-tools/src/org/jooq/xtend/Factory.xtend +++ b/jOOQ-tools/src/org/jooq/xtend/Factory.xtend @@ -78,7 +78,7 @@ class Factory extends Generators { * *

* Example: 

-                 * import static org.jooq.impl.Factory.*;
+                 * import static org.jooq.impl.DSL.*;
                  *
                  * // [...]
                  *
@@ -133,7 +133,7 @@ class Factory extends Generators {
                  * 
                  * 

                  * Example: 
-                 * import static org.jooq.impl.Factory.*;
+                 * import static org.jooq.impl.DSL.*;
                  *
                  * // [...]
                  *
diff --git a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
index 2ac0eb25a6..5bf397dea6 100644
--- a/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
+++ b/jOOQ-tools/src/org/jooq/xtend/Rows.xtend
@@ -1117,7 +1117,7 @@ class Rows extends Generators {
         «classHeader»
         package org.jooq.impl;
 
-        import static org.jooq.impl.Factory.row;
+        import static org.jooq.impl.DSL.row;
 
         import java.util.Arrays;
         import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/Case.java b/jOOQ/src/main/java/org/jooq/Case.java
index 6620db982e..414665a97d 100644
--- a/jOOQ/src/main/java/org/jooq/Case.java
+++ b/jOOQ/src/main/java/org/jooq/Case.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -52,7 +52,7 @@ import org.jooq.impl.Factory;
  *      ELSE            'three'
  * END
  * 
 Instances of Case are created through the
- * {@link Factory#decode()} method
+ * {@link DSL#decode()} method
  *
  * @author Lukas Eder
  */
diff --git a/jOOQ/src/main/java/org/jooq/Condition.java b/jOOQ/src/main/java/org/jooq/Condition.java
index 67a1c7dbbe..0c887e2af6 100644
--- a/jOOQ/src/main/java/org/jooq/Condition.java
+++ b/jOOQ/src/main/java/org/jooq/Condition.java
@@ -36,7 +36,7 @@
 
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -67,7 +67,7 @@ public interface Condition extends QueryPart {
      *
      * @param sql The other condition
      * @return The combined condition
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     Condition and(String sql);
@@ -84,7 +84,7 @@ public interface Condition extends QueryPart {
      * @param sql The other condition
      * @param bindings The bindings
      * @return The combined condition
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     Condition and(String sql, Object... bindings);
@@ -103,7 +103,7 @@ public interface Condition extends QueryPart {
      * @param parts The {@link QueryPart} objects that are rendered at the
      *            {numbered placeholder} locations
      * @return The combined condition
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     Condition and(String sql, QueryPart... parts);
@@ -159,7 +159,7 @@ public interface Condition extends QueryPart {
      *
      * @param sql The other condition
      * @return The combined condition
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     Condition or(String sql);
@@ -176,7 +176,7 @@ public interface Condition extends QueryPart {
      * @param sql The other condition
      * @param bindings The bindings
      * @return The combined condition
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     Condition or(String sql, Object... bindings);
@@ -195,7 +195,7 @@ public interface Condition extends QueryPart {
      * @param parts The {@link QueryPart} objects that are rendered at the
      *            {numbered placeholder} locations
      * @return The combined condition
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     Condition or(String sql, QueryPart... parts);
@@ -233,7 +233,7 @@ public interface Condition extends QueryPart {
     /**
      * Invert this condition
      * 

-     * This is the same as calling {@link Factory#not(Condition)}
+     * This is the same as calling {@link DSL#not(Condition)}
      *
      * @return This condition, inverted
      */
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 8074d7f5af..3de3015ee8 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -66,13 +66,13 @@ import org.jooq.conf.StatementType;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.MappingException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A contextual DSL providing "attached" implementations to the
  * org.jooq interfaces.
  * 

- * Apart from the {@link Factory}, this contextual DSL is the main entry point
+ * Apart from the {@link DSL}, this contextual DSL is the main entry point
  * for client code, to access jOOQ classes and functionality that are related to
  * {@link Query} execution. Unlike objects created through the
  * Factory, objects created from a DSLContext will be
@@ -93,12 +93,12 @@ import org.jooq.impl.Factory;
  * The Factory provides convenient constructors to create a
  * {@link Configuration}, which will be shared among all Query
  * objects thus created. Optionally, you can pass a reusable
- * Configuration to the {@link Factory#using(Configuration)}
+ * Configuration to the {@link DSL#using(Configuration)}
  * constructor. Please consider thread-safety concerns documented in
  * {@link Configuration}, should you want to reuse the same
  * Configuration instance in various threads and / or transactions.
  *
- * @see Factory
+ * @see DSL
  * @see Configuration
  * @author Lukas Eder
  */
@@ -223,22 +223,22 @@ public interface DSLContext {
      * allow for modifying bind values on an existing {@link Query} (or any
      * other {@link QueryPart}).
      * 

-     * Bind values created with {@link Factory#val(Object)} will have their bind
+     * Bind values created with {@link DSL#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Factory#param(String, Object)
+     * @see DSL#param(String, Object)
      */
     Map> extractParams(QueryPart part);
 
     /**
      * Get a named parameter from a {@link QueryPart}, provided its name.
      * 

-     * Bind values created with {@link Factory#val(Object)} will have their bind
+     * Bind values created with {@link DSL#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Factory#param(String, Object)
+     * @see DSL#param(String, Object)
      */
     Param extractParam(QueryPart part, String name);
 
@@ -352,7 +352,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -437,7 +437,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -541,7 +541,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -622,7 +622,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -709,7 +709,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -775,7 +775,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -904,7 +904,7 @@ public interface DSLContext {
      * guarantee syntax integrity. You may also create the possibility of
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! One way to escape
-     * literals is to use {@link Factory#name(String...)} and similar methods
+     * literals is to use {@link DSL#name(String...)} and similar methods
      *
      * @param sql The SQL clause, containing {numbered placeholders} where query
      *            parts can be injected
@@ -1326,7 +1326,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Collection)} instead.
+     * {@link DSL#select(Collection)} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -1338,7 +1338,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#select(Collection)
+     * @see DSL#select(Collection)
      */
     @Support
     SelectSelectStep select(Collection> fields);
@@ -1350,7 +1350,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field...)} instead.
+     * {@link DSL#select(Field...)} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -1363,7 +1363,7 @@ public interface DSLContext {
      *       .execute();
      * 

      *
-     * @see Factory#select(Field...)
+     * @see DSL#select(Field...)
      */
     @Support
     SelectSelectStep select(Field... fields);
@@ -1381,7 +1381,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field)} instead.
+     * {@link DSL#select(Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1392,7 +1392,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1411,7 +1411,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field)} instead.
+     * {@link DSL#select(Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1422,7 +1422,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1441,7 +1441,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1452,7 +1452,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1471,7 +1471,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1482,7 +1482,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1501,7 +1501,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1512,7 +1512,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1531,7 +1531,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1542,7 +1542,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1561,7 +1561,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1572,7 +1572,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1591,7 +1591,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1602,7 +1602,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1621,7 +1621,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1632,7 +1632,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1651,7 +1651,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1662,7 +1662,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1681,7 +1681,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1692,7 +1692,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1711,7 +1711,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1722,7 +1722,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1741,7 +1741,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1752,7 +1752,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1771,7 +1771,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1782,7 +1782,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1801,7 +1801,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1812,7 +1812,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1831,7 +1831,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1842,7 +1842,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1861,7 +1861,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1872,7 +1872,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1891,7 +1891,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1902,7 +1902,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1921,7 +1921,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1932,7 +1932,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1951,7 +1951,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1962,7 +1962,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -1981,7 +1981,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -1992,7 +1992,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2011,7 +2011,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#select(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2022,7 +2022,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2038,7 +2038,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Collection)} instead.
+     * {@link DSL#selectDistinct(Collection)} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -2050,7 +2050,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Collection)
+     * @see DSL#selectDistinct(Collection)
      */
     @Support
     SelectSelectStep selectDistinct(Collection> fields);
@@ -2062,7 +2062,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field...)} instead.
+     * {@link DSL#selectDistinct(Field...)} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -2074,7 +2074,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      */
     @Support
     SelectSelectStep selectDistinct(Field... fields);
@@ -2092,7 +2092,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field)} instead.
+     * {@link DSL#selectDistinct(Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2103,7 +2103,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2122,7 +2122,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2133,7 +2133,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2152,7 +2152,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2163,7 +2163,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2182,7 +2182,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2193,7 +2193,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2212,7 +2212,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2223,7 +2223,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2242,7 +2242,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2253,7 +2253,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2272,7 +2272,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2283,7 +2283,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2302,7 +2302,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2313,7 +2313,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2332,7 +2332,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2343,7 +2343,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2362,7 +2362,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2373,7 +2373,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2392,7 +2392,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2403,7 +2403,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2422,7 +2422,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2433,7 +2433,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2452,7 +2452,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2463,7 +2463,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2482,7 +2482,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2493,7 +2493,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2512,7 +2512,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2523,7 +2523,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2542,7 +2542,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2553,7 +2553,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2572,7 +2572,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2583,7 +2583,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2602,7 +2602,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2613,7 +2613,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2632,7 +2632,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2643,7 +2643,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2662,7 +2662,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2673,7 +2673,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2692,7 +2692,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2703,7 +2703,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2722,7 +2722,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
+     * {@link DSL#selectDistinct(Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field, Field)} instead.
      * 

      * Example: 
      * using(configuration)
@@ -2733,7 +2733,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectDistinct(Field...)
+     * @see DSL#selectDistinct(Field...)
      * @see #selectDistinct(Field...)
      */
     @Generated("This method was generated using jOOQ-tools")
@@ -2749,7 +2749,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectZero()} instead.
+     * {@link DSL#selectZero()} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -2761,8 +2761,8 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#zero()
-     * @see Factory#selectZero()
+     * @see DSL#zero()
+     * @see DSL#selectZero()
      */
     @Support
     SelectSelectStep> selectZero();
@@ -2774,7 +2774,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectOne()} instead.
+     * {@link DSL#selectOne()} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -2786,8 +2786,8 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#one()
-     * @see Factory#selectOne()
+     * @see DSL#one()
+     * @see DSL#selectOne()
      */
     @Support
     SelectSelectStep> selectOne();
@@ -2799,7 +2799,7 @@ public interface DSLContext {
      * statement from this {@link DSLContext}. If you don't need to render or
      * execute this SELECT statement (e.g. because you want to
      * create a subselect), consider using the static
-     * {@link Factory#selectCount()} instead.
+     * {@link DSL#selectCount()} instead.
      * 

      * Example: 
      * Executor create = Factory.using();
@@ -2811,7 +2811,7 @@ public interface DSLContext {
      *       .orderBy(field2);
      * 

      *
-     * @see Factory#selectCount()
+     * @see DSL#selectCount()
      */
     @Support
     SelectSelectStep> selectCount();
diff --git a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
index 16c684a29a..30560d5eb2 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -69,7 +69,7 @@ public interface DeleteConditionStep extends DeleteFinalStep and(String sql);
 
@@ -82,7 +82,7 @@ public interface DeleteConditionStep extends DeleteFinalStep and(String sql, Object... bindings);
 
@@ -95,7 +95,7 @@ public interface DeleteConditionStep extends DeleteFinalStep and(String sql, QueryPart... parts);
 
@@ -132,7 +132,7 @@ public interface DeleteConditionStep extends DeleteFinalStep or(String sql);
 
@@ -145,7 +145,7 @@ public interface DeleteConditionStep extends DeleteFinalStep or(String sql, Object... bindings);
 
@@ -158,7 +158,7 @@ public interface DeleteConditionStep extends DeleteFinalStep or(String sql, QueryPart... parts);
 
diff --git a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
index 36e9f3a62e..0c00c005d4 100644
--- a/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/DeleteWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Delete}'s DSL API.
@@ -74,7 +74,7 @@ public interface DeleteWhereStep extends DeleteFinalStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     DeleteConditionStep where(String sql);
@@ -87,7 +87,7 @@ public interface DeleteWhereStep extends DeleteFinalStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     DeleteConditionStep where(String sql, Object... bindings);
@@ -100,7 +100,7 @@ public interface DeleteWhereStep extends DeleteFinalStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     DeleteConditionStep where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
index 5e4f984045..884861174c 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * An intermediate type for the construction of a relational division. This type
@@ -61,7 +61,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     DivideByOnConditionStep and(String sql);
@@ -75,7 +75,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     DivideByOnConditionStep and(String sql, Object... bindings);
@@ -89,7 +89,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     DivideByOnConditionStep and(String sql, QueryPart... parts);
@@ -131,7 +131,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     DivideByOnConditionStep or(String sql);
@@ -145,7 +145,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     DivideByOnConditionStep or(String sql, Object... bindings);
@@ -159,7 +159,7 @@ public interface DivideByOnConditionStep extends DivideByReturningStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     DivideByOnConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
index 04c3aad355..1f3dc2dd74 100644
--- a/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/DivideByOnStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -59,7 +59,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     DivideByOnConditionStep on(String sql);
@@ -72,7 +72,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     DivideByOnConditionStep on(String sql, Object... bindings);
@@ -85,7 +85,7 @@ public interface DivideByOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     DivideByOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/ExecuteListener.java b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
index e4da2ab31e..8e2ad13bf3 100644
--- a/jOOQ/src/main/java/org/jooq/ExecuteListener.java
+++ b/jOOQ/src/main/java/org/jooq/ExecuteListener.java
@@ -45,7 +45,7 @@ import java.util.EventListener;
 import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
 import org.jooq.impl.DefaultExecuteListener;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.tools.LoggerListener;
 import org.jooq.tools.StopWatchListener;
 
@@ -57,7 +57,7 @@ import org.jooq.tools.StopWatchListener;
  * profilers, data collectors that can be hooked into a jOOQ {@link DSLContext}
  * using the {@link Configuration#getExecuteListeners()} property, passing
  * Settings to
- * {@link Factory#using(java.sql.Connection, SQLDialect, Settings)}. jOOQ
+ * {@link DSL#using(java.sql.Connection, SQLDialect, Settings)}. jOOQ
  * will use that configuration at the beginning of a query execution event to
  * instanciate all the provided listeners. In other words, listeners have the
  * same lifetime as a single query execution, and can thus be used to store
diff --git a/jOOQ/src/main/java/org/jooq/Field.java b/jOOQ/src/main/java/org/jooq/Field.java
index edf05e390a..7e1d136a0c 100644
--- a/jOOQ/src/main/java/org/jooq/Field.java
+++ b/jOOQ/src/main/java/org/jooq/Field.java
@@ -56,7 +56,7 @@ import java.util.Collection;
 import java.util.Map;
 
 import org.jooq.conf.Settings;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.types.Interval;
 import org.jooq.util.oracle.OracleFactory;
 
@@ -416,8 +416,8 @@ public interface Field extends GroupField {
      * In order to subtract one date time field from another, use any of these
      * methods:
      * 
    
-     * 
  •  {@link Factory#dateDiff(Field, Field)}
    • 
-     * 
  •  {@link Factory#timestampDiff(Field, Field)}
    • 
+     * 
  •  {@link DSL#dateDiff(Field, Field)}
    • 
+     * 
  •  {@link DSL#timestampDiff(Field, Field)}
    • 
      * 

      */
     @Support
@@ -1004,7 +1004,7 @@ public interface Field extends GroupField {
      * Note, this does not correspond to the Oracle Text CONTAINS()
      * function. Refer to {@link OracleFactory#contains(Field, String)} instead.
      *
-     * @see Factory#escape(String, char)
+     * @see DSL#escape(String, char)
      * @see #like(String, char)
      */
     @Support
@@ -1031,7 +1031,7 @@ public interface Field extends GroupField {
      * Note, this does not correspond to the Oracle Text CONTAINS()
      * function. Refer to {@link OracleFactory#contains(Field, String)} instead.
      *
-     * @see Factory#escape(Field, char)
+     * @see DSL#escape(Field, char)
      * @see #like(Field, char)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
@@ -1046,7 +1046,7 @@ public interface Field extends GroupField {
      * Note: This also works with numbers, for instance
      * val(1133).startsWith(11)
      *
-     * @see Factory#escape(String, char)
+     * @see DSL#escape(String, char)
      * @see #like(String, char)
      */
     @Support
@@ -1061,7 +1061,7 @@ public interface Field extends GroupField {
      * Note: This also works with numbers, for instance
      * val(1133).startsWith(11)
      *
-     * @see Factory#escape(Field, char)
+     * @see DSL#escape(Field, char)
      * @see #like(Field, char)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
@@ -1076,7 +1076,7 @@ public interface Field extends GroupField {
      * Note: This also works with numbers, for instance
      * val(1133).endsWith(33)
      *
-     * @see Factory#escape(String, char)
+     * @see DSL#escape(String, char)
      * @see #like(String, char)
      */
     @Support
@@ -1091,7 +1091,7 @@ public interface Field extends GroupField {
      * Note: This also works with numbers, for instance
      * val(1133).endsWith(33)
      *
-     * @see Factory#escape(Field, char)
+     * @see DSL#escape(Field, char)
      * @see #like(Field, char)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
@@ -1390,12 +1390,12 @@ public interface Field extends GroupField {
     /**
      * this = [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition equal(QuantifiedSelect> query);
@@ -1427,12 +1427,12 @@ public interface Field extends GroupField {
     /**
      * this = [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition eq(QuantifiedSelect> query);
@@ -1458,12 +1458,12 @@ public interface Field extends GroupField {
     /**
      * this != [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition notEqual(QuantifiedSelect> query);
@@ -1495,12 +1495,12 @@ public interface Field extends GroupField {
     /**
      * this != [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition ne(QuantifiedSelect> query);
@@ -1526,12 +1526,12 @@ public interface Field extends GroupField {
     /**
      * this < [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition lessThan(QuantifiedSelect> query);
@@ -1563,12 +1563,12 @@ public interface Field extends GroupField {
     /**
      * this < [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition lt(QuantifiedSelect> query);
@@ -1594,12 +1594,12 @@ public interface Field extends GroupField {
     /**
      * this <= [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition lessOrEqual(QuantifiedSelect> query);
@@ -1631,12 +1631,12 @@ public interface Field extends GroupField {
     /**
      * this <= [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition le(QuantifiedSelect> query);
@@ -1662,12 +1662,12 @@ public interface Field extends GroupField {
     /**
      * this > [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition greaterThan(QuantifiedSelect> query);
@@ -1699,12 +1699,12 @@ public interface Field extends GroupField {
     /**
      * this > [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition gt(QuantifiedSelect> query);
@@ -1730,12 +1730,12 @@ public interface Field extends GroupField {
     /**
      * this >= [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition greaterOrEqual(QuantifiedSelect> query);
@@ -1767,12 +1767,12 @@ public interface Field extends GroupField {
     /**
      * this >= [quantifier] (Select ...)
      *
-     * @see Factory#all(Field)
-     * @see Factory#all(Select)
-     * @see Factory#all(Object...)
-     * @see Factory#any(Field)
-     * @see Factory#any(Select)
-     * @see Factory#any(Object...)
+     * @see DSL#all(Field)
+     * @see DSL#all(Select)
+     * @see DSL#all(Object...)
+     * @see DSL#any(Field)
+     * @see DSL#any(Select)
+     * @see DSL#any(Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Condition ge(QuantifiedSelect> query);
@@ -1832,7 +1832,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sign(Field)
+     * @see DSL#sign(Field)
      */
     @Support
     Field sign();
@@ -1842,7 +1842,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#abs(Field)
+     * @see DSL#abs(Field)
      */
     @Support
     Field abs();
@@ -1852,7 +1852,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#round(Field)
+     * @see DSL#round(Field)
      */
     @Support
     Field round();
@@ -1862,7 +1862,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#round(Field, int)
+     * @see DSL#round(Field, int)
      */
     @Support
     Field round(int decimals);
@@ -1872,7 +1872,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#floor(Field)
+     * @see DSL#floor(Field)
      */
     @Support
     Field floor();
@@ -1882,7 +1882,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#ceil(Field)
+     * @see DSL#ceil(Field)
      */
     @Support
     Field ceil();
@@ -1892,7 +1892,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sqrt(Field)
+     * @see DSL#sqrt(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field sqrt();
@@ -1902,7 +1902,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#exp(Field)
+     * @see DSL#exp(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field exp();
@@ -1912,7 +1912,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#ln(Field)
+     * @see DSL#ln(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field ln();
@@ -1922,7 +1922,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#log(Field, int)
+     * @see DSL#log(Field, int)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field log(int base);
@@ -1932,7 +1932,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#power(Field, Number)
+     * @see DSL#power(Field, Number)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field pow(Number exponent);
@@ -1950,7 +1950,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#acos(Field)
+     * @see DSL#acos(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field acos();
@@ -1960,7 +1960,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#asin(Field)
+     * @see DSL#asin(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field asin();
@@ -1970,7 +1970,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#atan(Field)
+     * @see DSL#atan(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field atan();
@@ -1980,7 +1980,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#atan2(Field, Number)
+     * @see DSL#atan2(Field, Number)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field atan2(Number y);
@@ -1990,7 +1990,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#atan2(Field, Field)
+     * @see DSL#atan2(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field atan2(Field y);
@@ -2000,7 +2000,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#cos(Field)
+     * @see DSL#cos(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field cos();
@@ -2010,7 +2010,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sin(Field)
+     * @see DSL#sin(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field sin();
@@ -2020,7 +2020,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#tan(Field)
+     * @see DSL#tan(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field tan();
@@ -2030,7 +2030,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#cot(Field)
+     * @see DSL#cot(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field cot();
@@ -2040,7 +2040,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sinh(Field)
+     * @see DSL#sinh(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field sinh();
@@ -2050,7 +2050,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#cosh(Field)
+     * @see DSL#cosh(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field cosh();
@@ -2060,7 +2060,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#tanh(Field)
+     * @see DSL#tanh(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field tanh();
@@ -2070,7 +2070,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#coth(Field)
+     * @see DSL#coth(Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field coth();
@@ -2080,7 +2080,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#deg(Field)
+     * @see DSL#deg(Field)
      */
     @Support
     Field deg();
@@ -2090,7 +2090,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rad(Field)
+     * @see DSL#rad(Field)
      */
     @Support
     Field rad();
@@ -2100,7 +2100,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#count(Field)
+     * @see DSL#count(Field)
      */
     @Support
     Field count();
@@ -2110,7 +2110,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#countDistinct(Field)
+     * @see DSL#countDistinct(Field)
      */
     @Support
     Field countDistinct();
@@ -2120,7 +2120,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#max(Field)
+     * @see DSL#max(Field)
      */
     @Support
     Field max();
@@ -2130,7 +2130,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#min(Field)
+     * @see DSL#min(Field)
      */
     @Support
     Field min();
@@ -2140,7 +2140,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sum(Field)
+     * @see DSL#sum(Field)
      */
     @Support
     Field sum();
@@ -2150,7 +2150,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#avg(Field)
+     * @see DSL#avg(Field)
      */
     @Support
     Field avg();
@@ -2160,7 +2160,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#median(Field)
+     * @see DSL#median(Field)
      */
     @Support({ HSQLDB, ORACLE, SYBASE })
     Field median();
@@ -2170,7 +2170,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#stddevPop(Field)
+     * @see DSL#stddevPop(Field)
      */
     @Support({ ASE, CUBRID, DB2, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field stddevPop();
@@ -2180,7 +2180,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#stddevSamp(Field)
+     * @see DSL#stddevSamp(Field)
      */
     @Support({ ASE, CUBRID, DB2, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field stddevSamp();
@@ -2190,7 +2190,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#varPop(Field)
+     * @see DSL#varPop(Field)
      */
     @Support({ ASE, CUBRID, DB2, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field varPop();
@@ -2200,7 +2200,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#varSamp(Field)
+     * @see DSL#varSamp(Field)
      */
     @Support({ ASE, CUBRID, DB2, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field varSamp();
@@ -2210,7 +2210,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#count(Field)
+     * @see DSL#count(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2221,7 +2221,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#max(Field)
+     * @see DSL#max(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2232,7 +2232,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#min(Field)
+     * @see DSL#min(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2243,7 +2243,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#sum(Field)
+     * @see DSL#sum(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2254,7 +2254,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#avg(Field)
+     * @see DSL#avg(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2265,7 +2265,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#firstValue(Field)
+     * @see DSL#firstValue(Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE, SYBASE })
@@ -2276,7 +2276,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lastValue(Field)
+     * @see DSL#lastValue(Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE, SYBASE })
@@ -2287,7 +2287,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lead(Field)
+     * @see DSL#lead(Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2298,7 +2298,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lead(Field, int)
+     * @see DSL#lead(Field, int)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2309,7 +2309,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lead(Field, int, Object)
+     * @see DSL#lead(Field, int, Object)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2320,7 +2320,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lead(Field, int, Field)
+     * @see DSL#lead(Field, int, Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2331,7 +2331,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lag(Field)
+     * @see DSL#lag(Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2342,7 +2342,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lag(Field, int)
+     * @see DSL#lag(Field, int)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2353,7 +2353,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lag(Field, int, Object)
+     * @see DSL#lag(Field, int, Object)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2364,7 +2364,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lag(Field, int, Field)
+     * @see DSL#lag(Field, int, Field)
      * @see AggregateFunction#over()
      */
     @Support({ DB2, POSTGRES, ORACLE })
@@ -2375,7 +2375,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#stddevPop(Field)
+     * @see DSL#stddevPop(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2386,7 +2386,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#stddevSamp(Field)
+     * @see DSL#stddevSamp(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2397,7 +2397,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#varPop(Field)
+     * @see DSL#varPop(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2408,7 +2408,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#varSamp(Field)
+     * @see DSL#varSamp(Field)
      * @see AggregateFunction#over()
      */
     @Support({ CUBRID, DB2, POSTGRES, ORACLE, SQLSERVER, SYBASE })
@@ -2419,7 +2419,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#upper(Field)
+     * @see DSL#upper(Field)
      */
     @Support
     Field upper();
@@ -2429,7 +2429,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lower(Field)
+     * @see DSL#lower(Field)
      */
     @Support
     Field lower();
@@ -2439,7 +2439,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#trim(Field)
+     * @see DSL#trim(Field)
      */
     @Support
     Field trim();
@@ -2449,7 +2449,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rtrim(Field)
+     * @see DSL#rtrim(Field)
      */
     @Support
     Field rtrim();
@@ -2459,7 +2459,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#ltrim(Field)
+     * @see DSL#ltrim(Field)
      */
     @Support
     Field ltrim();
@@ -2469,7 +2469,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rpad(Field, Field)
+     * @see DSL#rpad(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field rpad(Field length);
@@ -2479,7 +2479,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rpad(Field, int)
+     * @see DSL#rpad(Field, int)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field rpad(int length);
@@ -2489,7 +2489,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rpad(Field, Field, Field)
+     * @see DSL#rpad(Field, Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field rpad(Field length, Field character);
@@ -2499,7 +2499,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#rpad(Field, int, char)
+     * @see DSL#rpad(Field, int, char)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field rpad(int length, char character);
@@ -2509,7 +2509,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lpad(Field, Field)
+     * @see DSL#lpad(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field lpad(Field length);
@@ -2519,7 +2519,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lpad(Field, int)
+     * @see DSL#lpad(Field, int)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field lpad(int length);
@@ -2529,7 +2529,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lpad(Field, Field, Field)
+     * @see DSL#lpad(Field, Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field lpad(Field length, Field character);
@@ -2539,7 +2539,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#lpad(Field, int, char)
+     * @see DSL#lpad(Field, int, char)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field lpad(int length, char character);
@@ -2549,7 +2549,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#repeat(Field, int)
+     * @see DSL#repeat(Field, int)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field repeat(Number count);
@@ -2559,7 +2559,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#repeat(Field, Field)
+     * @see DSL#repeat(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field repeat(Field count);
@@ -2569,7 +2569,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#replace(Field, Field)
+     * @see DSL#replace(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
     Field replace(Field search);
@@ -2579,7 +2579,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#replace(Field, String)
+     * @see DSL#replace(Field, String)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
     Field replace(String search);
@@ -2589,7 +2589,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#replace(Field, Field, Field)
+     * @see DSL#replace(Field, Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
     Field replace(Field search, Field replace);
@@ -2599,7 +2599,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#replace(Field, String, String)
+     * @see DSL#replace(Field, String, String)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE, SQLITE })
     Field replace(String search, String replace);
@@ -2609,7 +2609,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#position(Field, String)
+     * @see DSL#position(Field, String)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field position(String search);
@@ -2619,7 +2619,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#position(Field, Field)
+     * @see DSL#position(Field, Field)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field position(Field search);
@@ -2629,7 +2629,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#ascii(Field)
+     * @see DSL#ascii(Field)
      */
     @Support({ ASE, CUBRID, DB2, FIREBIRD, H2, HSQLDB, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Field ascii();
@@ -2639,7 +2639,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#concat(Field...)
+     * @see DSL#concat(Field...)
      */
     @Support
     Field concat(Field... fields);
@@ -2649,7 +2649,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#concat(String...)
+     * @see DSL#concat(String...)
      */
     @Support
     Field concat(String... values);
@@ -2659,7 +2659,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#substring(Field, int)
+     * @see DSL#substring(Field, int)
      */
     @Support
     Field substring(int startingPosition);
@@ -2669,7 +2669,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#substring(Field, Field)
+     * @see DSL#substring(Field, Field)
      */
     @Support
     Field substring(Field startingPosition);
@@ -2679,7 +2679,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#substring(Field, int, int)
+     * @see DSL#substring(Field, int, int)
      */
     @Support
     Field substring(int startingPosition, int length);
@@ -2689,7 +2689,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#substring(Field, Field, Field)
+     * @see DSL#substring(Field, Field, Field)
      */
     @Support
     Field substring(Field startingPosition, Field length);
@@ -2699,7 +2699,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#length(Field)
+     * @see DSL#length(Field)
      */
     @Support
     Field length();
@@ -2709,7 +2709,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#charLength(Field)
+     * @see DSL#charLength(Field)
      */
     @Support
     Field charLength();
@@ -2719,7 +2719,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#bitLength(Field)
+     * @see DSL#bitLength(Field)
      */
     @Support
     Field bitLength();
@@ -2729,7 +2729,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#octetLength(Field)
+     * @see DSL#octetLength(Field)
      */
     @Support
     Field octetLength();
@@ -2739,7 +2739,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#extract(Field, DatePart)
+     * @see DSL#extract(Field, DatePart)
      */
     @Support
     Field extract(DatePart datePart);
@@ -2749,7 +2749,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#greatest(Field, Field...)
+     * @see DSL#greatest(Field, Field...)
      */
     @Support
     Field greatest(T... others);
@@ -2759,7 +2759,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#greatest(Field, Field...)
+     * @see DSL#greatest(Field, Field...)
      */
     @Support
     Field greatest(Field... others);
@@ -2769,7 +2769,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#least(Field, Field...)
+     * @see DSL#least(Field, Field...)
      */
     @Support
     Field least(T... others);
@@ -2779,7 +2779,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#least(Field, Field...)
+     * @see DSL#least(Field, Field...)
      */
     @Support
     Field least(Field... others);
@@ -2789,7 +2789,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nvl(Field, Object)
+     * @see DSL#nvl(Field, Object)
      */
     @Support
     Field nvl(T defaultValue);
@@ -2799,7 +2799,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nvl(Field, Field)
+     * @see DSL#nvl(Field, Field)
      */
     @Support
     Field nvl(Field defaultValue);
@@ -2809,7 +2809,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nvl2(Field, Object, Object)
+     * @see DSL#nvl2(Field, Object, Object)
      */
     @Support
      Field nvl2(Z valueIfNotNull, Z valueIfNull);
@@ -2819,7 +2819,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nvl2(Field, Field, Field)
+     * @see DSL#nvl2(Field, Field, Field)
      */
     @Support
      Field nvl2(Field valueIfNotNull, Field valueIfNull);
@@ -2829,7 +2829,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nullif(Field, Object)
+     * @see DSL#nullif(Field, Object)
      */
     @Support
     Field nullif(T other);
@@ -2839,7 +2839,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#nullif(Field, Field)
+     * @see DSL#nullif(Field, Field)
      */
     @Support
     Field nullif(Field other);
@@ -2849,7 +2849,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#decode(Object, Object, Object)
+     * @see DSL#decode(Object, Object, Object)
      */
     @Support
      Field decode(T search, Z result);
@@ -2859,7 +2859,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#decode(Object, Object, Object, Object...)
+     * @see DSL#decode(Object, Object, Object, Object...)
      */
     @Support
      Field decode(T search, Z result, Object... more);
@@ -2869,7 +2869,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#decode(Field, Field, Field)
+     * @see DSL#decode(Field, Field, Field)
      */
     @Support
      Field decode(Field search, Field result);
@@ -2879,7 +2879,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#decode(Field, Field, Field, Field...)
+     * @see DSL#decode(Field, Field, Field, Field...)
      */
     @Support
      Field decode(Field search, Field result, Field... more);
@@ -2889,7 +2889,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#coalesce(Object, Object...)
+     * @see DSL#coalesce(Object, Object...)
      */
     @Support
     Field coalesce(T option, T... options);
@@ -2899,7 +2899,7 @@ public interface Field extends GroupField {
      * backwards-compatibility. It may be removed in the future. Consider using
      * equivalent methods from {@link DSLContext}
      *
-     * @see Factory#coalesce(Field, Field...)
+     * @see DSL#coalesce(Field, Field...)
      */
     @Support
     Field coalesce(Field option, Field... options);
diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
index e644806df2..5894d7e0ca 100644
--- a/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
+++ b/jOOQ/src/main/java/org/jooq/GroupConcatOrderByStep.java
@@ -46,14 +46,14 @@ import static org.jooq.SQLDialect.SYBASE;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
  * MySQL's GROUP_CONCAT function.
  *
  * @author Lukas Eder
- * @see Factory#listAgg(Field)
+ * @see DSL#listAgg(Field)
  */
 public interface GroupConcatOrderByStep extends GroupConcatSeparatorStep {
 
diff --git a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
index c8e274bff6..d1a555f794 100644
--- a/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
+++ b/jOOQ/src/main/java/org/jooq/GroupConcatSeparatorStep.java
@@ -44,13 +44,13 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SYBASE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * MySQL's GROUP_CONCAT function.
  *
  * @author Lukas Eder
- * @see Factory#listAgg(Field)
+ * @see DSL#listAgg(Field)
  */
 public interface GroupConcatSeparatorStep extends AggregateFunction {
 
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
index 162d4f449f..e7d6d1de7e 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnConditionStep.java
@@ -42,7 +42,7 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Merge}'s DSL API.
@@ -81,7 +81,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep and(String sql);
@@ -95,7 +95,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep and(String sql, Object... bindings);
@@ -109,7 +109,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep and(String sql, QueryPart... parts);
@@ -151,7 +151,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep or(String sql);
@@ -165,7 +165,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep or(String sql, Object... bindings);
@@ -179,7 +179,7 @@ public interface MergeOnConditionStep extends MergeMatchedStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/MergeOnStep.java b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
index 71db8c1a4f..55fb9c4811 100644
--- a/jOOQ/src/main/java/org/jooq/MergeOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/MergeOnStep.java
@@ -42,7 +42,7 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Merge}'s DSL API.
@@ -79,7 +79,7 @@ public interface MergeOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep on(String sql);
@@ -92,7 +92,7 @@ public interface MergeOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep on(String sql, Object... bindings);
@@ -105,7 +105,7 @@ public interface MergeOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, DB2, HSQLDB, ORACLE, SQLSERVER, SYBASE })
     MergeOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/Param.java b/jOOQ/src/main/java/org/jooq/Param.java
index c4082fc685..7d2c1cd95c 100644
--- a/jOOQ/src/main/java/org/jooq/Param.java
+++ b/jOOQ/src/main/java/org/jooq/Param.java
@@ -36,14 +36,14 @@
 package org.jooq;
 
 import org.jooq.exception.DataTypeException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.tools.Convert;
 
 /**
  * A named parameter and/or bind value.
  *
  * @author Lukas Eder
- * @see Factory#param(String, Object)
+ * @see DSL#param(String, Object)
  */
 public interface Param extends Field {
 
diff --git a/jOOQ/src/main/java/org/jooq/Query.java b/jOOQ/src/main/java/org/jooq/Query.java
index be9d01a83b..b5cc0b7442 100644
--- a/jOOQ/src/main/java/org/jooq/Query.java
+++ b/jOOQ/src/main/java/org/jooq/Query.java
@@ -45,7 +45,7 @@ import org.jooq.conf.Settings;
 import org.jooq.conf.StatementType;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.DataTypeException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * Any query
@@ -148,11 +148,11 @@ public interface Query extends QueryPart, Attachable {
      * cannot be modified, but the {@link Param} elements allow for modifying
      * bind values on an existing {@link Query}.
      * 

-     * Bind values created with {@link Factory#val(Object)} will have their bind
+     * Bind values created with {@link DSL#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Factory#param(String, Object)
+     * @see DSL#param(String, Object)
      * @see DSLContext#extractParams(QueryPart)
      */
     Map> getParams();
@@ -160,11 +160,11 @@ public interface Query extends QueryPart, Attachable {
     /**
      * Get a named parameter from the {@link Query}, provided its name.
      * 

-     * Bind values created with {@link Factory#val(Object)} will have their bind
+     * Bind values created with {@link DSL#val(Object)} will have their bind
      * index as name.
      *
      * @see Param
-     * @see Factory#param(String, Object)
+     * @see DSL#param(String, Object)
      * @see DSLContext#extractParam(QueryPart, String)
      */
     Param getParam(String name);
diff --git a/jOOQ/src/main/java/org/jooq/SQLDialect.java b/jOOQ/src/main/java/org/jooq/SQLDialect.java
index 2d51620b63..cf0e760f1e 100644
--- a/jOOQ/src/main/java/org/jooq/SQLDialect.java
+++ b/jOOQ/src/main/java/org/jooq/SQLDialect.java
@@ -36,7 +36,7 @@
 
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.util.ase.ASEFactory;
 import org.jooq.util.cubrid.CUBRIDFactory;
 import org.jooq.util.db2.DB2Factory;
@@ -139,9 +139,9 @@ public enum SQLDialect {
     SYBASE("Sybase", SybaseFactory.class);
 
     private final String                   name;
-    private final Class sQL;
+    private final Class sQL;
 
-    private SQLDialect(String name, Class sQL) {
+    private SQLDialect(String name, Class sQL) {
         this.name = name;
         this.sQL = sQL;
     }
@@ -171,7 +171,7 @@ public enum SQLDialect {
      * A {@link DSLContext} class whose instances are pre-configured with this
      * dialect.
      */
-    public final Class getFactory() {
+    public final Class getFactory() {
         return sQL;
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
index b020570e4c..fcaa9ce0ee 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -98,7 +98,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectConditionStep and(String sql);
@@ -112,7 +112,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectConditionStep and(String sql, Object... bindings);
@@ -126,7 +126,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectConditionStep and(String sql, QueryPart... parts);
@@ -168,7 +168,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectConditionStep or(String sql);
@@ -182,7 +182,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectConditionStep or(String sql, Object... bindings);
@@ -196,7 +196,7 @@ public interface SelectConditionStep extends SelectConnectBySt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
index b0c5fd1bc3..52825a7afd 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByConditionStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.ORACLE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -100,7 +100,7 @@ public interface SelectConnectByConditionStep extends SelectSt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({CUBRID, ORACLE})
     SelectConnectByConditionStep and(String sql);
@@ -114,7 +114,7 @@ public interface SelectConnectByConditionStep extends SelectSt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep and(String sql, Object... bindings);
@@ -128,7 +128,7 @@ public interface SelectConnectByConditionStep extends SelectSt
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep and(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
index ea74416659..30702dd294 100644
--- a/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectConnectByStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.ORACLE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -98,7 +98,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectBy(String sql);
@@ -111,7 +111,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectBy(String sql, Object... bindings);
@@ -124,7 +124,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectBy(String sql, QueryPart... parts);
@@ -145,7 +145,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectByNoCycle(String sql);
@@ -159,7 +159,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectByNoCycle(String sql, Object... bindings);
@@ -173,7 +173,7 @@ public interface SelectConnectByStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, ORACLE })
     SelectConnectByConditionStep connectByNoCycle(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectFromStep.java b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
index 1c6241ec59..6ef9505bc2 100644
--- a/jOOQ/src/main/java/org/jooq/SelectFromStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectFromStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -103,7 +103,7 @@ public interface SelectFromStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     SelectJoinStep from(String sql);
@@ -116,7 +116,7 @@ public interface SelectFromStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     SelectJoinStep from(String sql, Object... bindings);
@@ -129,7 +129,7 @@ public interface SelectFromStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     SelectJoinStep from(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
index b822471da9..bb12a89d89 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -98,7 +98,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectHavingConditionStep and(String sql);
@@ -112,7 +112,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep and(String sql, Object... bindings);
@@ -126,7 +126,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep and(String sql, QueryPart... parts);
@@ -168,7 +168,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectHavingConditionStep or(String sql);
@@ -182,7 +182,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep or(String sql, Object... bindings);
@@ -196,7 +196,7 @@ public interface SelectHavingConditionStep extends SelectOrder
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
index 8e930b665a..8e70b082f4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectHavingStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -103,7 +103,7 @@ public interface SelectHavingStep extends SelectOrderByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectHavingConditionStep having(String sql);
@@ -116,7 +116,7 @@ public interface SelectHavingStep extends SelectOrderByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectHavingConditionStep having(String sql, Object... bindings);
@@ -129,7 +129,7 @@ public interface SelectHavingStep extends SelectOrderByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectHavingConditionStep having(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
index c8944055ed..9f0124fc44 100644
--- a/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectJoinStep.java
@@ -49,7 +49,7 @@ import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -125,7 +125,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#join(String)
      */
     @Support
@@ -141,7 +141,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#join(String, Object...)
      */
     @Support
@@ -157,7 +157,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#join(String, QueryPart...)
      */
     @Support
@@ -197,7 +197,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#crossJoin(String)
      */
     @Support
@@ -220,7 +220,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#crossJoin(String, Object...)
      */
     @Support
@@ -243,7 +243,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#crossJoin(String, QueryPart...)
      */
     @Support
@@ -269,7 +269,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#leftOuterJoin(String)
      */
     @Support
@@ -285,7 +285,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#leftOuterJoin(String, Object...)
      */
     @Support
@@ -301,7 +301,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#leftOuterJoin(String, QueryPart...)
      */
     @Support
@@ -331,7 +331,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#rightOuterJoin(String)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -349,7 +349,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#rightOuterJoin(String, Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -367,7 +367,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#rightOuterJoin(String, QueryPart...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -397,7 +397,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#fullOuterJoin(String)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -415,7 +415,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#fullOuterJoin(String, Object...)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -433,7 +433,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#fullOuterJoin(String, QueryPart...)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -465,7 +465,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#naturalJoin(String)
      */
     @Support
@@ -484,7 +484,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#naturalJoin(String, Object...)
      */
     @Support
@@ -503,7 +503,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#naturalJoin(String, QueryPart...)
      */
     @Support
@@ -535,7 +535,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#naturalLeftOuterJoin(String)
      */
     @Support
@@ -554,7 +554,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#naturalLeftOuterJoin(String, Object...)
      */
     @Support
@@ -573,7 +573,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#naturalLeftOuterJoin(String, QueryPart...)
      */
     @Support
@@ -605,7 +605,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      * @see Table#naturalRightOuterJoin(String)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -624,7 +624,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      * @see Table#naturalRightOuterJoin(String, Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
@@ -643,7 +643,7 @@ public interface SelectJoinStep extends SelectWhereStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      * @see Table#naturalRightOuterJoin(String, QueryPart...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
index 4b61313897..3cafd63863 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -98,7 +98,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectOnConditionStep and(String sql);
@@ -112,7 +112,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectOnConditionStep and(String sql, Object... bindings);
@@ -126,7 +126,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectOnConditionStep and(String sql, QueryPart... parts);
@@ -168,7 +168,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectOnConditionStep or(String sql);
@@ -182,7 +182,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectOnConditionStep or(String sql, Object... bindings);
@@ -196,7 +196,7 @@ public interface SelectOnConditionStep extends SelectJoinStep<
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectOnConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectOnStep.java b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
index 52bee504d2..bb7a2dc53c 100644
--- a/jOOQ/src/main/java/org/jooq/SelectOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectOnStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import java.util.Collection;
 
 import org.jooq.exception.DataAccessException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -98,7 +98,7 @@ public interface SelectOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     SelectOnConditionStep on(String sql);
@@ -111,7 +111,7 @@ public interface SelectOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     SelectOnConditionStep on(String sql, Object... bindings);
@@ -124,7 +124,7 @@ public interface SelectOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     SelectOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
index c1a06406ca..ea13d31ac4 100644
--- a/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectStartWithStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.ORACLE;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -100,7 +100,7 @@ public interface SelectStartWithStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support({ CUBRID, ORACLE })
     SelectGroupByStep startWith(String sql);
@@ -114,7 +114,7 @@ public interface SelectStartWithStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support({ CUBRID, ORACLE })
     SelectGroupByStep startWith(String sql, Object... bindings);
@@ -128,7 +128,7 @@ public interface SelectStartWithStep extends SelectGroupByStep
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses! *
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support({ CUBRID, ORACLE })
     SelectGroupByStep startWith(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
index eb0570f568..3a83c18ded 100644
--- a/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/SelectWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Select}'s DSL API when selecting generic
@@ -103,7 +103,7 @@ public interface SelectWhereStep extends SelectConnectByStep where(String sql);
@@ -116,7 +116,7 @@ public interface SelectWhereStep extends SelectConnectByStep where(String sql, Object... bindings);
@@ -129,7 +129,7 @@ public interface SelectWhereStep extends SelectConnectByStep where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/Table.java b/jOOQ/src/main/java/org/jooq/Table.java
index 593f619ce8..e7ac7178b7 100644
--- a/jOOQ/src/main/java/org/jooq/Table.java
+++ b/jOOQ/src/main/java/org/jooq/Table.java
@@ -54,7 +54,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.jooq.conf.Settings;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A table to be used in queries
@@ -381,7 +381,7 @@ public interface Table extends TableLike {
      * Depending on the JoinType, a subsequent
      * {@link TableOnStep#on(Condition...)} or
      * {@link TableOnStep#using(Field...)} clause is required. If it is required
-     * but omitted, a {@link Factory#trueCondition()}, i.e. 1 = 1
+     * but omitted, a {@link DSL#trueCondition()}, i.e. 1 = 1
      * condition will be rendered
      */
     @Support
@@ -401,7 +401,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     TableOnStep join(String sql);
@@ -414,7 +414,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     TableOnStep join(String sql, Object... bindings);
@@ -427,7 +427,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     TableOnStep join(String sql, QueryPart... parts);
@@ -446,7 +446,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     TablePartitionByStep leftOuterJoin(String sql);
@@ -459,7 +459,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     TablePartitionByStep leftOuterJoin(String sql, Object... bindings);
@@ -472,7 +472,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     TablePartitionByStep leftOuterJoin(String sql, QueryPart... parts);
@@ -495,7 +495,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TablePartitionByStep rightOuterJoin(String sql);
@@ -510,7 +510,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TablePartitionByStep rightOuterJoin(String sql, Object... bindings);
@@ -525,7 +525,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TablePartitionByStep rightOuterJoin(String sql, QueryPart... parts);
@@ -548,7 +548,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TableOnStep fullOuterJoin(String sql);
@@ -563,7 +563,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TableOnStep fullOuterJoin(String sql, Object... bindings);
@@ -578,7 +578,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support({ DB2, FIREBIRD, HSQLDB, INGRES, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     TableOnStep fullOuterJoin(String sql, QueryPart... parts);
@@ -611,7 +611,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     Table crossJoin(String sql);
@@ -631,7 +631,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     Table crossJoin(String sql, Object... bindings);
@@ -651,7 +651,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     Table crossJoin(String sql, QueryPart... parts);
@@ -676,7 +676,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     Table naturalJoin(String sql);
@@ -692,7 +692,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     Table naturalJoin(String sql, Object... bindings);
@@ -708,7 +708,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     Table naturalJoin(String sql, QueryPart... parts);
@@ -733,7 +733,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support
     Table naturalLeftOuterJoin(String sql);
@@ -749,7 +749,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support
     Table naturalLeftOuterJoin(String sql, Object... bindings);
@@ -765,7 +765,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support
     Table naturalLeftOuterJoin(String sql, QueryPart... parts);
@@ -790,7 +790,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String)
+     * @see DSL#table(String)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Table naturalRightOuterJoin(String sql);
@@ -806,7 +806,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, Object...)
+     * @see DSL#table(String, Object...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Table naturalRightOuterJoin(String sql, Object... bindings);
@@ -822,7 +822,7 @@ public interface Table extends TableLike {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#table(String, QueryPart...)
+     * @see DSL#table(String, QueryPart...)
      */
     @Support({ ASE, CUBRID, DB2, DERBY, FIREBIRD, H2, HSQLDB, INGRES, MYSQL, ORACLE, POSTGRES, SQLSERVER, SYBASE })
     Table naturalRightOuterJoin(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
index 86c7a0607d..be81650e9b 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -64,7 +64,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     TableOnConditionStep and(String sql);
@@ -78,7 +78,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     TableOnConditionStep and(String sql, Object... bindings);
@@ -92,7 +92,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep and(String sql, QueryPart... parts);
@@ -134,7 +134,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     TableOnConditionStep or(String sql);
@@ -148,7 +148,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     TableOnConditionStep or(String sql, Object... bindings);
@@ -162,7 +162,7 @@ public interface TableOnConditionStep extends Table {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/TableOnStep.java b/jOOQ/src/main/java/org/jooq/TableOnStep.java
index c256420201..67636928c6 100644
--- a/jOOQ/src/main/java/org/jooq/TableOnStep.java
+++ b/jOOQ/src/main/java/org/jooq/TableOnStep.java
@@ -38,7 +38,7 @@ package org.jooq;
 import java.util.Collection;
 
 import org.jooq.exception.DataAccessException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * An intermediate type for the construction of a JOIN clause,
@@ -64,7 +64,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     TableOnConditionStep on(String sql);
@@ -77,7 +77,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     TableOnConditionStep on(String sql, Object... bindings);
@@ -90,7 +90,7 @@ public interface TableOnStep {
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     TableOnConditionStep on(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
index 21b60cf86a..05b9692158 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateConditionStep.java
@@ -35,7 +35,7 @@
  */
 package org.jooq;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 
 /**
@@ -71,7 +71,7 @@ public interface UpdateConditionStep extends UpdateFinalStep and(String sql);
@@ -85,7 +85,7 @@ public interface UpdateConditionStep extends UpdateFinalStep and(String sql, Object... bindings);
@@ -99,7 +99,7 @@ public interface UpdateConditionStep extends UpdateFinalStep and(String sql, QueryPart... parts);
@@ -141,7 +141,7 @@ public interface UpdateConditionStep extends UpdateFinalStep or(String sql);
@@ -155,7 +155,7 @@ public interface UpdateConditionStep extends UpdateFinalStep or(String sql, Object... bindings);
@@ -169,7 +169,7 @@ public interface UpdateConditionStep extends UpdateFinalStep or(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
index 0b03b47a81..bfeac0c0b0 100644
--- a/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
+++ b/jOOQ/src/main/java/org/jooq/UpdateWhereStep.java
@@ -37,7 +37,7 @@ package org.jooq;
 
 import java.util.Collection;
 
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * This type is used for the {@link Update}'s DSL API.
@@ -76,7 +76,7 @@ public interface UpdateWhereStep extends UpdateFinalStep, U
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String)
+     * @see DSL#condition(String)
      */
     @Support
     UpdateConditionStep where(String sql);
@@ -89,7 +89,7 @@ public interface UpdateWhereStep extends UpdateFinalStep, U
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, Object...)
+     * @see DSL#condition(String, Object...)
      */
     @Support
     UpdateConditionStep where(String sql, Object... bindings);
@@ -102,7 +102,7 @@ public interface UpdateWhereStep extends UpdateFinalStep, U
      * malicious SQL injection. Be sure to properly use bind variables and/or
      * escape literals when concatenated into SQL clauses!
      *
-     * @see Factory#condition(String, QueryPart...)
+     * @see DSL#condition(String, QueryPart...)
      */
     @Support
     UpdateConditionStep where(String sql, QueryPart... parts);
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractCondition.java b/jOOQ/src/main/java/org/jooq/impl/AbstractCondition.java
index 6a6671d83e..c91194da82 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractCondition.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
 
 import java.util.Arrays;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
index 3cf176caa2..5723ff0246 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractField.java
@@ -39,10 +39,10 @@ import static org.jooq.impl.ExpressionOperator.ADD;
 import static org.jooq.impl.ExpressionOperator.DIVIDE;
 import static org.jooq.impl.ExpressionOperator.MULTIPLY;
 import static org.jooq.impl.ExpressionOperator.SUBTRACT;
-import static org.jooq.impl.Factory.falseCondition;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.nullSafe;
-import static org.jooq.impl.Factory.trueCondition;
+import static org.jooq.impl.DSL.falseCondition;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.nullSafe;
+import static org.jooq.impl.DSL.trueCondition;
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
@@ -216,7 +216,7 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
 
     @Override
     public final  SortField sort(Map sortMap) {
-        CaseValueStep decode = Factory.decode().value(this);
+        CaseValueStep decode = DSL.decode().value(this);
         CaseWhenStep result = null;
 
         for (Entry entry : sortMap.entrySet()) {
@@ -551,25 +551,25 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
 
     @Override
     public final Condition startsWith(T value) {
-        Field concat = Factory.concat(Utils.escapeForLike(value), inline("%"));
+        Field concat = DSL.concat(Utils.escapeForLike(value), inline("%"));
         return like(concat, Utils.ESCAPE);
     }
 
     @Override
     public final Condition startsWith(Field value) {
-        Field concat = Factory.concat(Utils.escapeForLike(value), inline("%"));
+        Field concat = DSL.concat(Utils.escapeForLike(value), inline("%"));
         return like(concat, Utils.ESCAPE);
     }
 
     @Override
     public final Condition endsWith(T value) {
-        Field concat = Factory.concat(inline("%"), Utils.escapeForLike(value));
+        Field concat = DSL.concat(inline("%"), Utils.escapeForLike(value));
         return like(concat, Utils.ESCAPE);
     }
 
     @Override
     public final Condition endsWith(Field value) {
-        Field concat = Factory.concat(inline("%"), Utils.escapeForLike(value));
+        Field concat = DSL.concat(inline("%"), Utils.escapeForLike(value));
         return like(concat, Utils.ESCAPE);
     }
 
@@ -852,7 +852,7 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
 
     @Override
     public final Condition equalIgnoreCase(Field value) {
-        return Factory.lower(cast(String.class)).equal(Factory.lower(value));
+        return DSL.lower(cast(String.class)).equal(DSL.lower(value));
     }
 
     @Override
@@ -882,7 +882,7 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
 
     @Override
     public final Condition notEqualIgnoreCase(Field value) {
-        return Factory.lower(cast(String.class)).notEqual(Factory.lower(value));
+        return DSL.lower(cast(String.class)).notEqual(DSL.lower(value));
     }
 
     @Override
@@ -1031,71 +1031,71 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
     @Override
     @Deprecated
     public final Field sign() {
-        return Factory.sign(numeric());
+        return DSL.sign(numeric());
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @Deprecated
     public final Field abs() {
-        return (Field) Factory.abs(numeric());
+        return (Field) DSL.abs(numeric());
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @Deprecated
     public final Field round() {
-        return (Field) Factory.round(numeric());
+        return (Field) DSL.round(numeric());
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @Deprecated
     public final Field round(int decimals) {
-        return (Field) Factory.round(numeric(), decimals);
+        return (Field) DSL.round(numeric(), decimals);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @Deprecated
     public final Field floor() {
-        return (Field) Factory.floor(numeric());
+        return (Field) DSL.floor(numeric());
     }
 
     @SuppressWarnings("unchecked")
     @Override
     @Deprecated
     public final Field ceil() {
-        return (Field) Factory.ceil(numeric());
+        return (Field) DSL.ceil(numeric());
     }
 
     @Override
     @Deprecated
     public final Field sqrt() {
-        return Factory.sqrt(numeric());
+        return DSL.sqrt(numeric());
     }
 
     @Override
     @Deprecated
     public final Field exp() {
-        return Factory.exp(numeric());
+        return DSL.exp(numeric());
     }
 
     @Override
     @Deprecated
     public final Field ln() {
-        return Factory.ln(numeric());
+        return DSL.ln(numeric());
     }
 
     @Override
     @Deprecated
     public final Field log(int base) {
-        return Factory.log(numeric(), base);
+        return DSL.log(numeric(), base);
     }
 
     @Override
     public final Field pow(Number exponent) {
-        return Factory.power(numeric(), exponent);
+        return DSL.power(numeric(), exponent);
     }
 
     @Override
@@ -1107,565 +1107,565 @@ abstract class AbstractField extends AbstractQueryPart implements Field {
     @Override
     @Deprecated
     public final Field acos() {
-        return Factory.acos(numeric());
+        return DSL.acos(numeric());
     }
 
     @Override
     @Deprecated
     public final Field asin() {
-        return Factory.asin(numeric());
+        return DSL.asin(numeric());
     }
 
     @Override
     @Deprecated
     public final Field atan() {
-        return Factory.atan(numeric());
+        return DSL.atan(numeric());
     }
 
     @Override
     @Deprecated
     public final Field atan2(Number y) {
-        return Factory.atan2(numeric(), y);
+        return DSL.atan2(numeric(), y);
     }
 
     @Override
     @Deprecated
     public final Field atan2(Field y) {
-        return Factory.atan2(numeric(), y);
+        return DSL.atan2(numeric(), y);
     }
 
     @Override
     @Deprecated
     public final Field cos() {
-        return Factory.cos(numeric());
+        return DSL.cos(numeric());
     }
 
     @Override
     @Deprecated
     public final Field sin() {
-        return Factory.sin(numeric());
+        return DSL.sin(numeric());
     }
 
     @Override
     @Deprecated
     public final Field tan() {
-        return Factory.tan(numeric());
+        return DSL.tan(numeric());
     }
 
     @Override
     @Deprecated
     public final Field cot() {
-        return Factory.cot(numeric());
+        return DSL.cot(numeric());
     }
 
     @Override
     @Deprecated
     public final Field sinh() {
-        return Factory.sinh(numeric());
+        return DSL.sinh(numeric());
     }
 
     @Override
     @Deprecated
     public final Field cosh() {
-        return Factory.cosh(numeric());
+        return DSL.cosh(numeric());
     }
 
     @Override
     @Deprecated
     public final Field tanh() {
-        return Factory.tanh(numeric());
+        return DSL.tanh(numeric());
     }
 
     @Override
     @Deprecated
     public final Field coth() {
-        return Factory.coth(numeric());
+        return DSL.coth(numeric());
     }
 
     @Override
     @Deprecated
     public final Field deg() {
-        return Factory.deg(numeric());
+        return DSL.deg(numeric());
     }
 
     @Override
     @Deprecated
     public final Field rad() {
-        return Factory.rad(numeric());
+        return DSL.rad(numeric());
     }
 
     @Override
     @Deprecated
     public final Field count() {
-        return Factory.count(this);
+        return DSL.count(this);
     }
 
     @Override
     @Deprecated
     public final Field countDistinct() {
-        return Factory.countDistinct(this);
+        return DSL.countDistinct(this);
     }
 
     @Override
     @Deprecated
     public final Field max() {
-        return Factory.max(this);
+        return DSL.max(this);
     }
 
     @Override
     @Deprecated
     public final Field min() {
-        return Factory.min(this);
+        return DSL.min(this);
     }
 
     @Override
     @Deprecated
     public final Field sum() {
-        return Factory.sum(numeric());
+        return DSL.sum(numeric());
     }
 
     @Override
     @Deprecated
     public final Field avg() {
-        return Factory.avg(numeric());
+        return DSL.avg(numeric());
     }
 
     @Override
     @Deprecated
     public final Field median() {
-        return Factory.median(numeric());
+        return DSL.median(numeric());
     }
 
     @Override
     @Deprecated
     public final Field stddevPop() {
-        return Factory.stddevPop(numeric());
+        return DSL.stddevPop(numeric());
     }
 
     @Override
     @Deprecated
     public final Field stddevSamp() {
-        return Factory.stddevSamp(numeric());
+        return DSL.stddevSamp(numeric());
     }
 
     @Override
     @Deprecated
     public final Field varPop() {
-        return Factory.varPop(numeric());
+        return DSL.varPop(numeric());
     }
 
     @Override
     @Deprecated
     public final Field varSamp() {
-        return Factory.varSamp(numeric());
+        return DSL.varSamp(numeric());
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep countOver() {
-        return Factory.count(this).over();
+        return DSL.count(this).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep maxOver() {
-        return Factory.max(this).over();
+        return DSL.max(this).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep minOver() {
-        return Factory.min(this).over();
+        return DSL.min(this).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep sumOver() {
-        return Factory.sum(numeric()).over();
+        return DSL.sum(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep avgOver() {
-        return Factory.avg(numeric()).over();
+        return DSL.avg(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep firstValue() {
-        return Factory.firstValue(this);
+        return DSL.firstValue(this);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lastValue() {
-        return Factory.lastValue(this);
+        return DSL.lastValue(this);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lead() {
-        return Factory.lead(this);
+        return DSL.lead(this);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lead(int offset) {
-        return Factory.lead(this, offset);
+        return DSL.lead(this, offset);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lead(int offset, T defaultValue) {
-        return Factory.lead(this, offset, defaultValue);
+        return DSL.lead(this, offset, defaultValue);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lead(int offset, Field defaultValue) {
-        return Factory.lead(this, offset, defaultValue);
+        return DSL.lead(this, offset, defaultValue);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lag() {
-        return Factory.lag(this);
+        return DSL.lag(this);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lag(int offset) {
-        return Factory.lag(this, offset);
+        return DSL.lag(this, offset);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lag(int offset, T defaultValue) {
-        return Factory.lag(this, offset, defaultValue);
+        return DSL.lag(this, offset, defaultValue);
     }
 
     @Override
     @Deprecated
     public final WindowIgnoreNullsStep lag(int offset, Field defaultValue) {
-        return Factory.lag(this, offset, defaultValue);
+        return DSL.lag(this, offset, defaultValue);
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep stddevPopOver() {
-        return Factory.stddevPop(numeric()).over();
+        return DSL.stddevPop(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep stddevSampOver() {
-        return Factory.stddevSamp(numeric()).over();
+        return DSL.stddevSamp(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep varPopOver() {
-        return Factory.varPop(numeric()).over();
+        return DSL.varPop(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final WindowPartitionByStep varSampOver() {
-        return Factory.varSamp(numeric()).over();
+        return DSL.varSamp(numeric()).over();
     }
 
     @Override
     @Deprecated
     public final Field upper() {
-        return Factory.upper(varchar());
+        return DSL.upper(varchar());
     }
 
     @Override
     @Deprecated
     public final Field lower() {
-        return Factory.lower(varchar());
+        return DSL.lower(varchar());
     }
 
     @Override
     @Deprecated
     public final Field trim() {
-        return Factory.trim(varchar());
+        return DSL.trim(varchar());
     }
 
     @Override
     @Deprecated
     public final Field rtrim() {
-        return Factory.rtrim(varchar());
+        return DSL.rtrim(varchar());
     }
 
     @Override
     @Deprecated
     public final Field ltrim() {
-        return Factory.ltrim(varchar());
+        return DSL.ltrim(varchar());
     }
 
     @Override
     @Deprecated
     public final Field rpad(Field length) {
-        return Factory.rpad(varchar(), length);
+        return DSL.rpad(varchar(), length);
     }
 
     @Override
     @Deprecated
     public final Field rpad(int length) {
-        return Factory.rpad(varchar(), length);
+        return DSL.rpad(varchar(), length);
     }
 
     @Override
     @Deprecated
     public final Field rpad(Field length, Field character) {
-        return Factory.rpad(varchar(), length, character);
+        return DSL.rpad(varchar(), length, character);
     }
 
     @Override
     @Deprecated
     public final Field rpad(int length, char character) {
-        return Factory.rpad(varchar(), length, character);
+        return DSL.rpad(varchar(), length, character);
     }
 
     @Override
     @Deprecated
     public final Field lpad(Field length) {
-        return Factory.lpad(varchar(), length);
+        return DSL.lpad(varchar(), length);
     }
 
     @Override
     @Deprecated
     public final Field lpad(int length) {
-        return Factory.lpad(varchar(), length);
+        return DSL.lpad(varchar(), length);
     }
 
     @Override
     @Deprecated
     public final Field lpad(Field length, Field character) {
-        return Factory.lpad(varchar(), length, character);
+        return DSL.lpad(varchar(), length, character);
     }
 
     @Override
     @Deprecated
     public final Field lpad(int length, char character) {
-        return Factory.lpad(varchar(), length, character);
+        return DSL.lpad(varchar(), length, character);
     }
 
     @Override
     @Deprecated
     public final Field repeat(Number count) {
-        return Factory.repeat(varchar(), count == null ? 0 : count.intValue());
+        return DSL.repeat(varchar(), count == null ? 0 : count.intValue());
     }
 
     @Override
     @Deprecated
     public final Field repeat(Field count) {
-        return Factory.repeat(varchar(), count);
+        return DSL.repeat(varchar(), count);
     }
 
     @Override
     @Deprecated
     public final Field replace(Field search) {
-        return Factory.replace(varchar(), search);
+        return DSL.replace(varchar(), search);
     }
 
     @Override
     @Deprecated
     public final Field replace(String search) {
-        return Factory.replace(varchar(), search);
+        return DSL.replace(varchar(), search);
     }
 
     @Override
     @Deprecated
     public final Field replace(Field search, Field replace) {
-        return Factory.replace(varchar(), search, replace);
+        return DSL.replace(varchar(), search, replace);
     }
 
     @Override
     @Deprecated
     public final Field replace(String search, String replace) {
-        return Factory.replace(varchar(), search, replace);
+        return DSL.replace(varchar(), search, replace);
     }
 
     @Override
     @Deprecated
     public final Field position(String search) {
-        return Factory.position(varchar(), search);
+        return DSL.position(varchar(), search);
     }
 
     @Override
     @Deprecated
     public final Field position(Field search) {
-        return Factory.position(varchar(), search);
+        return DSL.position(varchar(), search);
     }
 
     @Override
     @Deprecated
     public final Field ascii() {
-        return Factory.ascii(varchar());
+        return DSL.ascii(varchar());
     }
 
     @Override
     @Deprecated
     public final Field concat(Field... fields) {
-        return Factory.concat(Utils.combine(this, fields));
+        return DSL.concat(Utils.combine(this, fields));
     }
 
     @Override
     @Deprecated
     public final Field concat(String... values) {
-        return Factory.concat(Utils.combine(this, Utils.fields(values).toArray(new Field[0])));
+        return DSL.concat(Utils.combine(this, Utils.fields(values).toArray(new Field[0])));
     }
 
     @Override
     @Deprecated
     public final Field substring(int startingPosition) {
-        return Factory.substring(varchar(), startingPosition);
+        return DSL.substring(varchar(), startingPosition);
     }
 
     @Override
     @Deprecated
     public final Field substring(Field startingPosition) {
-        return Factory.substring(varchar(), startingPosition);
+        return DSL.substring(varchar(), startingPosition);
     }
 
     @Override
     @Deprecated
     public final Field substring(int startingPosition, int length) {
-        return Factory.substring(varchar(), startingPosition, length);
+        return DSL.substring(varchar(), startingPosition, length);
     }
 
     @Override
     @Deprecated
     public final Field substring(Field startingPosition, Field length) {
-        return Factory.substring(varchar(), startingPosition, length);
+        return DSL.substring(varchar(), startingPosition, length);
     }
 
     @Override
     @Deprecated
     public final Field length() {
-        return Factory.length(varchar());
+        return DSL.length(varchar());
     }
 
     @Override
     @Deprecated
     public final Field charLength() {
-        return Factory.charLength(varchar());
+        return DSL.charLength(varchar());
     }
 
     @Override
     @Deprecated
     public final Field bitLength() {
-        return Factory.bitLength(varchar());
+        return DSL.bitLength(varchar());
     }
 
     @Override
     @Deprecated
     public final Field octetLength() {
-        return Factory.octetLength(varchar());
+        return DSL.octetLength(varchar());
     }
 
     @Override
     @Deprecated
     public final Field extract(DatePart datePart) {
-        return Factory.extract(date(), datePart);
+        return DSL.extract(date(), datePart);
     }
 
     @Override
     @Deprecated
     public final Field greatest(T... others) {
-        return Factory.greatest(this, Utils.fields(others).toArray(new Field[0]));
+        return DSL.greatest(this, Utils.fields(others).toArray(new Field[0]));
     }
 
     @Override
     @Deprecated
     public final Field greatest(Field... others) {
-        return Factory.greatest(this, others);
+        return DSL.greatest(this, others);
     }
 
     @Override
     @Deprecated
     public final Field least(T... others) {
-        return Factory.least(this, Utils.fields(others).toArray(new Field[0]));
+        return DSL.least(this, Utils.fields(others).toArray(new Field[0]));
     }
 
     @Override
     @Deprecated
     public final Field least(Field... others) {
-        return Factory.least(this, others);
+        return DSL.least(this, others);
     }
 
     @Override
     @Deprecated
     public final Field nvl(T defaultValue) {
-        return Factory.nvl(this, defaultValue);
+        return DSL.nvl(this, defaultValue);
     }
 
     @Override
     @Deprecated
     public final Field nvl(Field defaultValue) {
-        return Factory.nvl(this, defaultValue);
+        return DSL.nvl(this, defaultValue);
     }
 
     @Override
     @Deprecated
     public final  Field nvl2(Z valueIfNotNull, Z valueIfNull) {
-        return Factory.nvl2(this, valueIfNotNull, valueIfNull);
+        return DSL.nvl2(this, valueIfNotNull, valueIfNull);
     }
 
     @Override
     @Deprecated
     public final  Field nvl2(Field valueIfNotNull, Field valueIfNull) {
-        return Factory.nvl2(this, valueIfNotNull, valueIfNull);
+        return DSL.nvl2(this, valueIfNotNull, valueIfNull);
     }
 
     @Override
     @Deprecated
     public final Field nullif(T other) {
-        return Factory.nullif(this, other);
+        return DSL.nullif(this, other);
     }
 
     @Override
     @Deprecated
     public final Field nullif(Field other) {
-        return Factory.nullif(this, other);
+        return DSL.nullif(this, other);
     }
 
     @Override
     @Deprecated
     public final  Field decode(T search, Z result) {
-        return Factory.decode(this, search, result);
+        return DSL.decode(this, search, result);
     }
 
     @Override
     @Deprecated
     public final  Field decode(T search, Z result, Object... more) {
-        return Factory.decode(this, search, result, more);
+        return DSL.decode(this, search, result, more);
     }
 
     @Override
     @Deprecated
     public final  Field decode(Field search, Field result) {
-        return Factory.decode(this, search, result);
+        return DSL.decode(this, search, result);
     }
 
     @Override
     @Deprecated
     public final  Field decode(Field search, Field result, Field... more) {
-        return Factory.decode(this, search, result, more);
+        return DSL.decode(this, search, result, more);
     }
 
     @Override
     @Deprecated
     public final Field coalesce(T option, T... options) {
-        return Factory.coalesce(this, Utils.combine(Utils.field(option), Utils.fields(options).toArray(new Field[0])));
+        return DSL.coalesce(this, Utils.combine(Utils.field(option), Utils.fields(options).toArray(new Field[0])));
     }
 
     @Override
     @Deprecated
     public final Field coalesce(Field option, Field... options) {
-        return Factory.coalesce(this, Utils.combine(option, options));
+        return DSL.coalesce(this, Utils.combine(option, options));
     }
 
     // ------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
index 973c6c2eb0..00a27d4d0b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractQueryPart.java
@@ -137,21 +137,21 @@ abstract class AbstractQueryPart implements QueryPartInternal {
      * Internal convenience method
      */
     protected final DSLContext create(Configuration configuration) {
-        return Factory.using(configuration);
+        return DSL.using(configuration);
     }
 
     /**
      * Internal convenience method
      */
     protected final DSLContext create(RenderContext ctx) {
-        return Factory.using(ctx.configuration());
+        return DSL.using(ctx.configuration());
     }
 
     /**
      * Internal convenience method
      */
     protected final DSLContext create(BindContext ctx) {
-        return Factory.using(ctx.configuration());
+        return DSL.using(ctx.configuration());
     }
 
     /**
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
index 036d1a84db..fee926bf61 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractRoutine.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.table;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.table;
+import static org.jooq.impl.DSL.val;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
index 52703949e3..9cf0363336 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSelect.java
@@ -65,7 +65,7 @@ abstract class AbstractSelect extends AbstractResultQuery i
 
     @Override
     public final int fetchCount() throws DataAccessException {
-        return Factory.using(getConfiguration()).fetchCount(this);
+        return DSL.using(getConfiguration()).fetchCount(this);
     }
 
     @Override
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
index 71e4e7dd22..148e392562 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStore.java
@@ -94,7 +94,7 @@ abstract class AbstractStore implements AttachableInternal {
      * This method is used in generated code!
      */
     protected final DSLContext create() {
-        return Factory.using(getConfiguration());
+        return DSL.using(getConfiguration());
     }
 
     // -------------------------------------------------------------------------
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
index c857b6e0c1..b31070563e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractStoreQuery.java
@@ -256,7 +256,7 @@ abstract class AbstractStoreQuery extends AbstractQuery implem
                     result = ctx.statement().executeUpdate();
                     listener.executeEnd(ctx);
 
-                    DSLContext create = Factory.using(ctx.connection(), SQLDialect.SQLITE, ctx.configuration().getSettings());
+                    DSLContext create = DSL.using(ctx.connection(), SQLDialect.SQLITE, ctx.configuration().getSettings());
                     returned =
                     create.select(returning)
                           .from(getInto())
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
index 32269fbfb0..4196fb0c7e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractTable.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.table;
+import static org.jooq.impl.DSL.table;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Alias.java b/jOOQ/src/main/java/org/jooq/impl/Alias.java
index e537e11835..e9b903c90a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Alias.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Alias.java
@@ -48,9 +48,9 @@ import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.falseCondition;
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.select;
+import static org.jooq.impl.DSL.falseCondition;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.select;
 import static org.jooq.impl.Utils.list;
 
 import org.jooq.BindContext;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java b/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
index 2b6e7cc51f..5fbd542e0a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayConstant.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.val;
 
 import org.jooq.ArrayRecord;
 import org.jooq.BindContext;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
index 971e22ad34..6bb66c07dc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTable.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.fieldByName;
+import static org.jooq.impl.DSL.fieldByName;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -135,7 +135,7 @@ class ArrayTable extends AbstractTable {
 
         // Simple array types have a synthetic field called "COLUMN_VALUE"
         else {
-            result.add(fieldByName(Factory.getDataType(arrayType), alias, "COLUMN_VALUE"));
+            result.add(fieldByName(DSL.getDataType(arrayType), alias, "COLUMN_VALUE"));
         }
 
         return new Fields(result);
diff --git a/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java b/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java
index 45a51171cf..fbd84b7374 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ArrayTableSimulation.java
@@ -35,10 +35,10 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.falseCondition;
-import static org.jooq.impl.Factory.fieldByName;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.using;
+import static org.jooq.impl.DSL.falseCondition;
+import static org.jooq.impl.DSL.fieldByName;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.using;
 
 import org.jooq.BindContext;
 import org.jooq.Configuration;
@@ -83,7 +83,7 @@ class ArrayTableSimulation extends AbstractTable {
         this.array = array;
         this.alias = alias;
         this.fieldAlias = fieldAlias == null ? "COLUMN_VALUE" : fieldAlias;
-        this.field = new Fields(fieldByName(Factory.getDataType(array.getClass().getComponentType()), alias, this.fieldAlias));
+        this.field = new Fields(fieldByName(DSL.getDataType(array.getClass().getComponentType()), alias, this.fieldAlias));
     }
 
     @Override
@@ -138,7 +138,7 @@ class ArrayTableSimulation extends AbstractTable {
             for (Object element : array) {
 
                 // [#1081] Be sure to get the correct cast type also for null
-                Field val = Factory.val(element, field.fields[0].getDataType());
+                Field val = DSL.val(element, field.fields[0].getDataType());
                 Select subselect = using(configuration).select(val.as("COLUMN_VALUE")).select();
 
                 if (select == null) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ascii.java b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
index a1eb2c45b2..d9f92e4fe4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ascii.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ascii.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
index 30729c5f1d..b69782b70a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchCRUD.java
@@ -69,7 +69,7 @@ class BatchCRUD implements Batch {
     private final Action               action;
 
     BatchCRUD(Configuration configuration, Action action, UpdatableRecord[] records) {
-        this.create = Factory.using(configuration);
+        this.create = DSL.using(configuration);
         this.configuration = configuration;
         this.action = action;
         this.records = records;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
index cacc015b27..99631dd7f7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchMultiple.java
@@ -79,7 +79,7 @@ class BatchMultiple implements Batch {
             String[] batchSQL = ctx.batchSQL();
             for (int i = 0; i < queries.length; i++) {
                 listener.renderStart(ctx);
-                batchSQL[i] = Factory.using(configuration).renderInlined(queries[i]);
+                batchSQL[i] = DSL.using(configuration).renderInlined(queries[i]);
                 listener.renderEnd(ctx);
             }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
index e04995ac30..d472cde822 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BatchSingle.java
@@ -66,7 +66,7 @@ class BatchSingle implements BatchBindStep {
     private final List allBindValues;
 
     public BatchSingle(Configuration configuration, Query query) {
-        this.create = Factory.using(configuration);
+        this.create = DSL.using(configuration);
         this.configuration = configuration;
         this.query = query;
         this.allBindValues = new ArrayList();
diff --git a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
index a348afbd71..c670351dbc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BetweenCondition.java
@@ -48,7 +48,7 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.val;
 
 import org.jooq.BetweenAndStep;
 import org.jooq.BindContext;
diff --git a/jOOQ/src/main/java/org/jooq/impl/BitCount.java b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
index da848b8e4c..415a7f5863 100644
--- a/jOOQ/src/main/java/org/jooq/impl/BitCount.java
+++ b/jOOQ/src/main/java/org/jooq/impl/BitCount.java
@@ -35,10 +35,10 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.bitAnd;
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.shr;
+import static org.jooq.impl.DSL.bitAnd;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.shr;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cast.java b/jOOQ/src/main/java/org/jooq/impl/Cast.java
index e51761a02c..5a55be6537 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cast.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cast.java
@@ -36,7 +36,7 @@
 package org.jooq.impl;
 
 import static java.util.Arrays.asList;
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.inline;
 import static org.jooq.impl.SQLDataType.BOOLEAN;
 import static org.jooq.impl.SQLDataType.DOUBLE;
 import static org.jooq.impl.SQLDataType.FLOAT;
@@ -146,7 +146,7 @@ class Cast extends AbstractField {
     private Field asDecodeNumberToBoolean() {
 
         // [#859] 0 => false, null => null, all else is true
-        return Factory.decode().value((Field) field)
+        return DSL.decode().value((Field) field)
                                .when(inline(0), inline(false))
                                .when(inline((Integer) null), inline((Boolean) null))
                                .otherwise(inline(true));
@@ -157,9 +157,9 @@ class Cast extends AbstractField {
         Field s = (Field) field;
 
         // [#859] '0', 'f', 'false' => false, null => null, all else is true
-        return Factory.decode().when(s.equal(inline("0")), inline(false))
-                               .when(Factory.lower(s).equal(inline("false")), inline(false))
-                               .when(Factory.lower(s).equal(inline("f")), inline(false))
+        return DSL.decode().when(s.equal(inline("0")), inline(false))
+                               .when(DSL.lower(s).equal(inline("false")), inline(false))
+                               .when(DSL.lower(s).equal(inline("f")), inline(false))
                                .when(s.isNull(), inline((Boolean) null))
                                .otherwise(inline(true));
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ceil.java b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
index 0bf6d13841..2f2d0c8c5a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ceil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ceil.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -64,7 +64,7 @@ class Ceil extends AbstractFunction {
 
             // evaluate "ceil" if unavailable
             case SQLITE:
-                return Factory.round(argument.add(0.499999999999999));
+                return DSL.round(argument.add(0.499999999999999));
 
             case ASE:
             case H2:
diff --git a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
index 63ec1e4a3e..2e8f86b46d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
@@ -36,7 +36,7 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.trueCondition;
+import static org.jooq.impl.DSL.trueCondition;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Concat.java b/jOOQ/src/main/java/org/jooq/impl/Concat.java
index edb86ba21e..2387d1d824 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Concat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Concat.java
@@ -37,8 +37,8 @@ package org.jooq.impl;
 
 import static org.jooq.impl.ExpressionOperator.ADD;
 import static org.jooq.impl.ExpressionOperator.CONCAT;
-import static org.jooq.impl.Factory.castAll;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.castAll;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
index 2a5cf8a209..e24479957c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionAsField.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Condition;
 import org.jooq.Configuration;
@@ -70,7 +70,7 @@ class ConditionAsField extends AbstractFunction {
             case ORACLE:
             case SQLSERVER:
             case SYBASE:
-                return Factory.decode().when(condition, inline(true)).otherwise(inline(false));
+                return DSL.decode().when(condition, inline(true)).otherwise(inline(false));
 
             // These databases can inline predicates in column expression contexts
             case DERBY:
diff --git a/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java b/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
index 70b269373d..f69ef78ea8 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ConditionProviderImpl.java
@@ -36,7 +36,7 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.trueCondition;
+import static org.jooq.impl.DSL.trueCondition;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Contains.java b/jOOQ/src/main/java/org/jooq/impl/Contains.java
index 3670278050..6741c39007 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Contains.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Contains.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.val;
 
 import org.jooq.BindContext;
 import org.jooq.Condition;
@@ -94,10 +94,10 @@ class Contains extends AbstractCondition {
             Field concat;
 
             if (rhs == null) {
-                concat = Factory.concat(inline("%"), Utils.escapeForLike(value), inline("%"));
+                concat = DSL.concat(inline("%"), Utils.escapeForLike(value), inline("%"));
             }
             else {
-                concat = Factory.concat(inline("%"), Utils.escapeForLike(rhs), inline("%"));
+                concat = DSL.concat(inline("%"), Utils.escapeForLike(rhs), inline("%"));
             }
 
             return lhs.like(concat, Utils.ESCAPE);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cosh.java b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
index 93fb98d558..556dd2123d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cosh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cosh.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.two;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.two;
 
 import java.math.BigDecimal;
 
@@ -73,7 +73,7 @@ class Cosh extends AbstractFunction {
             case POSTGRES:
             case SQLSERVER:
             case SYBASE:
-                return Factory.exp(argument.mul(two())).add(one()).div(Factory.exp(argument).mul(two()));
+                return DSL.exp(argument.mul(two())).add(one()).div(DSL.exp(argument).mul(two()));
 
             default:
                 return function("cosh", SQLDataType.NUMERIC, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Cot.java b/jOOQ/src/main/java/org/jooq/impl/Cot.java
index 38e4b796c7..67f15d570a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Cot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Cot.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import java.math.BigDecimal;
 
@@ -65,7 +65,7 @@ class Cot extends AbstractFunction {
         switch (configuration.getDialect()) {
             case INGRES:
             case ORACLE:
-                return Factory.cos(argument).div(Factory.sin(argument));
+                return DSL.cos(argument).div(DSL.sin(argument));
 
             default:
                 return function("cot", SQLDataType.NUMERIC, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
index 4b0928dfca..d5d7fa41ce 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentDate.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import java.sql.Date;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
index 94837ac4a9..984cb1c2d4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTime.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import java.sql.Time;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
index dac22ab262..96a37f3de2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentTimestamp.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import java.sql.Timestamp;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
index 4865b08936..16b5dc4a77 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CurrentUser.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
index 7ddfb4d641..9898b10b4e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DAOImpl.java
@@ -37,7 +37,7 @@ package org.jooq.impl;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static org.jooq.impl.Factory.using;
+import static org.jooq.impl.DSL.using;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Factory.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
similarity index 96%
rename from jOOQ/src/main/java/org/jooq/impl/Factory.java
rename to jOOQ/src/main/java/org/jooq/impl/DSL.java
index a9a4bedfeb..6f87525283 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Factory.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -146,46 +146,56 @@ import org.jooq.exception.SQLDialectNotSupportedException;
 import org.jooq.types.DayToSecond;
 
 /**
- * A factory providing implementations to the org.jooq interfaces.
+ * A DSL "entry point" providing implementations to the org.jooq
+ * interfaces.
  * 

- * Apart from the {@link DSLContext}, this factory is the main entry point for
+ * The {@link DSLContext} and this DSL are the main entry point for
  * client code, to access jOOQ classes and functionality. Here, you can
  * instanciate all of those objects that cannot be accessed through other
  * objects. For example, to create a {@link Field} representing a constant
  * value, you can write:
  * 

  * 
- * Field<String> field = Factory.val("Hello World")
+ * Field<String> field = DSL.val("Hello World")
  * 

  * 

- * Also, some SQL clauses cannot be expressed easily with DSL, for instance the
- * EXISTS clause, as it is not applied on a concrete object (yet). Hence you
- * should write
+ * Another example is the EXISTS clause, which you can apply to any
+ * SELECT to form a {@link Condition}:
  * 

  * 
- * Condition condition = Factory.exists(Factory.select(...));
+ * Condition condition = DSL.exists(DSL.select(...));
  * 

  * 

- * 
Factory and static imports

+ * 
DSL and static imports

  * 

  * For increased fluency and readability of your jOOQ client code, it is
- * recommended that you static import all methods from the Factory.
- * For example: 
- * import static org.jooq.impl.Factory.*;
+ * recommended that you static import all methods from the DSL. For
+ * example: 
+ * import static org.jooq.impl.DSL.*;
  *
  * public class Main {
  *   public static void main(String[] args) {
- *     Factory.select(val("Hello"), inline("World"));
- *     // Factory.val ^^^           ^^^^^^ Factory.inline
+ *     DSL.select(val("Hello"), inline("World"));
+ *     // DSL.val ^^^           ^^^^^^ Factory.inline
  *   }
  * }
  * 

+ * 

+ * In order to use the "contextual DSL", call one of the various overloaded
+ * {@link #using(Configuration)} methods:
+ * 

+ * 
+ * // Create and immediately execute a SELECT statement:
+ * DSL.using(connection, dialect)
+ *    .selectOne()
+ *    .fetch();
+ * 

  *
  * @see DSLContext
  * @author Lukas Eder
  */
 @SuppressWarnings({ "unchecked", "rawtypes" })
-public class Factory {
+public class DSL {
 
     // -------------------------------------------------------------------------
     // XXX Contextual factory methods
@@ -349,7 +359,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -380,7 +390,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -438,7 +448,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -476,7 +486,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -514,7 +524,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -552,7 +562,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -590,7 +600,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -628,7 +638,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -666,7 +676,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -704,7 +714,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -742,7 +752,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -780,7 +790,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -818,7 +828,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -856,7 +866,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -894,7 +904,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -932,7 +942,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -970,7 +980,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1008,7 +1018,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1046,7 +1056,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1084,7 +1094,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1122,7 +1132,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1160,7 +1170,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1198,7 +1208,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1236,7 +1246,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1271,7 +1281,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1302,7 +1312,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1339,7 +1349,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1377,7 +1387,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1415,7 +1425,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1453,7 +1463,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1491,7 +1501,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1529,7 +1539,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1567,7 +1577,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1605,7 +1615,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1643,7 +1653,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1681,7 +1691,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1719,7 +1729,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1757,7 +1767,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1795,7 +1805,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1833,7 +1843,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1871,7 +1881,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1909,7 +1919,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1947,7 +1957,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -1985,7 +1995,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2023,7 +2033,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2061,7 +2071,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2099,7 +2109,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2137,7 +2147,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2172,7 +2182,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2183,7 +2193,7 @@ public class Factory {
      *  .orderBy(field2);
      * 

      *
-     * @see Factory#zero()
+     * @see DSL#zero()
      * @see DSLContext#selectZero()
      */
     @Support
@@ -2204,7 +2214,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2215,7 +2225,7 @@ public class Factory {
      *  .orderBy(field2);
      * 

      *
-     * @see Factory#one()
+     * @see DSL#one()
      * @see DSLContext#selectOne()
      */
     @Support
@@ -2236,7 +2246,7 @@ public class Factory {
      * 
      * 

      * Example: 
-     * import static org.jooq.impl.Factory.*;
+     * import static org.jooq.impl.DSL.*;
      *
      * // [...]
      *
@@ -2247,7 +2257,7 @@ public class Factory {
      *  .orderBy(field2);
      * 

      *
-     * @see Factory#count()
+     * @see DSL#count()
      * @see DSLContext#selectCount()
      */
     @Support
@@ -8464,7 +8474,7 @@ public class Factory {
     /**
      * No instances.
      */
-    protected Factory() {
+    protected DSL() {
         throw new UnsupportedOperationException();
     }
 
@@ -8475,7 +8485,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(Connection connection, SQLDialect dialect) {
+    private DSL(Connection connection, SQLDialect dialect) {
         throw new UnsupportedOperationException();
     }
 
@@ -8486,7 +8496,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(Connection connection, SQLDialect dialect, Settings settings) {
+    private DSL(Connection connection, SQLDialect dialect, Settings settings) {
         throw new UnsupportedOperationException();
     }
 
@@ -8497,7 +8507,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(DataSource datasource, SQLDialect dialect) {
+    private DSL(DataSource datasource, SQLDialect dialect) {
         throw new UnsupportedOperationException();
     }
 
@@ -8508,7 +8518,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(DataSource datasource, SQLDialect dialect, Settings settings) {
+    private DSL(DataSource datasource, SQLDialect dialect, Settings settings) {
         throw new UnsupportedOperationException();
     }
 
@@ -8519,7 +8529,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(SQLDialect dialect) {
+    private DSL(SQLDialect dialect) {
         throw new UnsupportedOperationException();
     }
 
@@ -8530,7 +8540,7 @@ public class Factory {
      * >See the jOOQ manual's section about migrating to jOOQ 3.0
      */
     @SuppressWarnings("unused")
-    private Factory(SQLDialect dialect, Settings settings) {
+    private DSL(SQLDialect dialect, Settings settings) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java b/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
index bb2ab50966..b5edc7cf02 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSLContextImpl.java
@@ -51,9 +51,9 @@ import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
 import static org.jooq.conf.SettingsTools.getRenderMapping;
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.fieldByName;
-import static org.jooq.impl.Factory.trueCondition;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.fieldByName;
+import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.Utils.list;
 
 import java.io.IOException;
@@ -670,7 +670,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final  SelectWhereStep selectFrom(Table table) {
-        SelectWhereStep result = Factory.selectFrom(table);
+        SelectWhereStep result = DSL.selectFrom(table);
         result.attach(configuration);
         return result;
     }
@@ -678,7 +678,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep select(Collection> fields) {
-        SelectSelectStep result = Factory.select(fields);
+        SelectSelectStep result = DSL.select(fields);
         result.attach(configuration);
         return result;
     }
@@ -686,7 +686,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep select(Field... fields) {
-        SelectSelectStep result = Factory.select(fields);
+        SelectSelectStep result = DSL.select(fields);
         result.attach(configuration);
         return result;
     }
@@ -830,7 +830,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep selectDistinct(Collection> fields) {
-        SelectSelectStep result = Factory.selectDistinct(fields);
+        SelectSelectStep result = DSL.selectDistinct(fields);
         result.attach(configuration);
         return result;
     }
@@ -838,7 +838,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep selectDistinct(Field... fields) {
-        SelectSelectStep result = Factory.selectDistinct(fields);
+        SelectSelectStep result = DSL.selectDistinct(fields);
         result.attach(configuration);
         return result;
     }
@@ -982,7 +982,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep> selectZero() {
-        SelectSelectStep> result = Factory.selectZero();
+        SelectSelectStep> result = DSL.selectZero();
         result.attach(configuration);
         return result;
     }
@@ -990,7 +990,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep> selectOne() {
-        SelectSelectStep> result = Factory.selectOne();
+        SelectSelectStep> result = DSL.selectOne();
         result.attach(configuration);
         return result;
     }
@@ -998,7 +998,7 @@ class DSLContextImpl implements DSLContext, Serializable {
     @Override
     @Support
     public final SelectSelectStep> selectCount() {
-        SelectSelectStep> result = Factory.selectCount();
+        SelectSelectStep> result = DSL.selectCount();
         result.attach(configuration);
         return result;
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
index 6cccfd0211..30ffbc96d4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DateDiff.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import java.sql.Date;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Decode.java b/jOOQ/src/main/java/org/jooq/impl/Decode.java
index 22e6ce0cfc..67fd9a359a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Decode.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Decode.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.CaseConditionStep;
 import org.jooq.Configuration;
@@ -77,7 +77,7 @@ class Decode extends AbstractFunction {
 
             // Other dialects simulate it with a CASE ... WHEN expression
             default: {
-                CaseConditionStep when = Factory
+                CaseConditionStep when = DSL
                     .decode()
                     .when(field.isNotDistinctFrom(search), result);
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
index 016f8c7409..65f4af0802 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConfiguration.java
@@ -55,7 +55,7 @@ import org.jooq.conf.SettingsTools;
 
 /**
  * A default implementation for configurations within a {@link DSLContext}, if no
- * custom configuration was supplied to {@link Factory#using(Configuration)}
+ * custom configuration was supplied to {@link DSL#using(Configuration)}
  */
 class DefaultConfiguration implements Configuration {
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java b/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
index ba8b5a01c7..a01f1cae81 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultConnectionProvider.java
@@ -57,7 +57,7 @@ import org.jooq.tools.JooqLogger;
  */
 public class DefaultConnectionProvider implements ConnectionProvider {
 
-    private static final JooqLogger log = JooqLogger.getLogger(Factory.class);
+    private static final JooqLogger log = JooqLogger.getLogger(DSL.class);
     private Connection              connection;
 
     public DefaultConnectionProvider(Connection connection) {
diff --git a/jOOQ/src/main/java/org/jooq/impl/Degrees.java b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
index 7b124115f7..851504bb7d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Degrees.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Degrees.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.pi;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.pi;
 
 import java.math.BigDecimal;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
index 16ffdde5a0..691ad201e9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DeleteImpl.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
 
 import java.util.Collection;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
index 7f73a607cf..7f780201a9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DivideBy.java
@@ -35,11 +35,11 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
-import static org.jooq.impl.Factory.selectDistinct;
-import static org.jooq.impl.Factory.selectOne;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
+import static org.jooq.impl.DSL.selectDistinct;
+import static org.jooq.impl.DSL.selectOne;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Euler.java b/jOOQ/src/main/java/org/jooq/impl/Euler.java
index 67d75129e4..5e956b9db4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Euler.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Euler.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.one;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.one;
 
 import java.math.BigDecimal;
 
@@ -74,7 +74,7 @@ class Euler extends AbstractFunction {
             case POSTGRES:
             case SQLSERVER:
             case SYBASE:
-                return Factory.exp(one());
+                return DSL.exp(one());
 
             case SQLITE:
                 return inline(Math.E, BigDecimal.class);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Expression.java b/jOOQ/src/main/java/org/jooq/impl/Expression.java
index 2030771a07..2a2fdbdea2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Expression.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Expression.java
@@ -58,15 +58,15 @@ import static org.jooq.impl.ExpressionOperator.BIT_XOR;
 import static org.jooq.impl.ExpressionOperator.SHL;
 import static org.jooq.impl.ExpressionOperator.SHR;
 import static org.jooq.impl.ExpressionOperator.SUBTRACT;
-import static org.jooq.impl.Factory.bitAnd;
-import static org.jooq.impl.Factory.bitNot;
-import static org.jooq.impl.Factory.bitOr;
-import static org.jooq.impl.Factory.bitXor;
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.two;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.bitAnd;
+import static org.jooq.impl.DSL.bitNot;
+import static org.jooq.impl.DSL.bitOr;
+import static org.jooq.impl.DSL.bitXor;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.two;
+import static org.jooq.impl.DSL.val;
 
 import java.sql.Timestamp;
 
@@ -166,10 +166,10 @@ class Expression extends AbstractFunction {
 
         // Many dialects don't support shifts. Use multiplication/division instead
         else if (SHL == operator && asList(ASE, DB2, H2, HSQLDB, INGRES, ORACLE, SQLSERVER, SYBASE).contains(dialect)) {
-            return lhs.mul(Factory.power(two(), rhsAsNumber()));
+            return lhs.mul(DSL.power(two(), rhsAsNumber()));
         }
         else if (SHR == operator && asList(ASE, DB2, H2, HSQLDB, INGRES, ORACLE, SQLSERVER, SYBASE).contains(dialect)) {
-            return lhs.div(Factory.power(two(), rhsAsNumber()));
+            return lhs.div(DSL.power(two(), rhsAsNumber()));
         }
 
         // Some dialects support shifts as functions
diff --git a/jOOQ/src/main/java/org/jooq/impl/Extract.java b/jOOQ/src/main/java/org/jooq/impl/Extract.java
index 49d09abec5..d3d895143c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Extract.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Extract.java
@@ -36,8 +36,8 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.DatePart;
diff --git a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
index 1cbf9d9283..132926e589 100644
--- a/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/FieldMapsForInsert.java
@@ -102,7 +102,7 @@ class FieldMapsForInsert extends AbstractQueryPart {
         Select select = null;
         for (FieldMapForInsert map : insertMaps) {
             if (map != null) {
-                Select iteration = Factory.using(context.configuration()).select(map.values());
+                Select iteration = DSL.using(context.configuration()).select(map.values());
 
                 if (select == null) {
                     select = iteration;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Floor.java b/jOOQ/src/main/java/org/jooq/impl/Floor.java
index 229f901cac..54e03f828e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Floor.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Floor.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -64,7 +64,7 @@ class Floor extends AbstractFunction {
 
             // evaluate "floor" if unavailable
             case SQLITE:
-                return Factory.round(argument.sub(0.499999999999999));
+                return DSL.round(argument.sub(0.499999999999999));
 
             default:
                 return function("floor", getDataType(), argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Function.java b/jOOQ/src/main/java/org/jooq/impl/Function.java
index b74b598f1d..29552a0783 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Function.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Function.java
@@ -44,7 +44,7 @@ import static org.jooq.SQLDialect.HSQLDB;
 import static org.jooq.SQLDialect.MYSQL;
 import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.one;
+import static org.jooq.impl.DSL.one;
 import static org.jooq.impl.Term.LIST_AGG;
 import static org.jooq.impl.Term.ROW_NUMBER;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Greatest.java b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
index 27b69bfb3c..a794e7e39f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Greatest.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Greatest.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.DataType;
@@ -80,12 +80,12 @@ class Greatest extends AbstractFunction {
                     Field[] remaining = new Field[getArguments().length - 2];
                     System.arraycopy(getArguments(), 2, remaining, 0, remaining.length);
 
-                    return Factory.decode()
-                        .when(first.greaterThan(other), Factory.greatest(first, remaining))
-                        .otherwise(Factory.greatest(other, remaining));
+                    return DSL.decode()
+                        .when(first.greaterThan(other), DSL.greatest(first, remaining))
+                        .otherwise(DSL.greatest(other, remaining));
                 }
                 else {
-                    return Factory.decode()
+                    return DSL.decode()
                         .when(first.greaterThan(other), first)
                         .otherwise(other);
                 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
index ec0be88219..d8e81a8f0d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/GroupConcat.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.inline;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
index b6805f4178..c35eac142d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
+++ b/jOOQ/src/main/java/org/jooq/impl/IsDistinctFrom.java
@@ -46,10 +46,10 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.decode;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.zero;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.decode;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.zero;
 
 import org.jooq.BindContext;
 import org.jooq.Comparator;
diff --git a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
index ead2e20bb7..e5e91d08c3 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JoinTable.java
@@ -50,9 +50,9 @@ import static org.jooq.SQLDialect.H2;
 import static org.jooq.SQLDialect.INGRES;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/LTrim.java b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
index 671186c211..ee030f71db 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LTrim.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Least.java b/jOOQ/src/main/java/org/jooq/impl/Least.java
index 0495ef0174..97d655f413 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Least.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Least.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.DataType;
@@ -79,12 +79,12 @@ class Least extends AbstractFunction {
                     Field[] remaining = new Field[getArguments().length - 2];
                     System.arraycopy(getArguments(), 2, remaining, 0, remaining.length);
 
-                    return Factory.decode()
-                        .when(first.lessThan(other), Factory.least(first, remaining))
-                        .otherwise(Factory.least(other, remaining));
+                    return DSL.decode()
+                        .when(first.lessThan(other), DSL.least(first, remaining))
+                        .otherwise(DSL.least(other, remaining));
                 }
                 else {
-                    return Factory.decode()
+                    return DSL.decode()
                         .when(first.lessThan(other), first)
                         .otherwise(other);
                 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index a531344a39..94514b550a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -36,8 +36,8 @@
 package org.jooq.impl;
 
 import static org.jooq.RenderContext.CastMode.NEVER;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.val;
 
 import org.jooq.BindContext;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Ln.java b/jOOQ/src/main/java/org/jooq/impl/Ln.java
index 2c6bb10ebf..c6a41f681c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Ln.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Ln.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import java.math.BigDecimal;
 
@@ -90,7 +90,7 @@ class Ln extends AbstractFunction {
                 case INGRES:
                 case SQLSERVER:
                 case SYBASE:
-                    return Factory.ln(argument).div(Factory.ln(inline(base)));
+                    return DSL.ln(argument).div(DSL.ln(inline(base)));
 
                 default:
                     return function("log", SQLDataType.NUMERIC, inline(base), argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
index 216319391e..fa33778331 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
@@ -127,7 +127,7 @@ class LoaderImpl> implements
     private final List errors;
 
     LoaderImpl(Configuration configuration, Table table) {
-        this.create = Factory.using(configuration);
+        this.create = DSL.using(configuration);
         this.configuration = configuration;
         this.table = table;
         this.errors = new ArrayList();
diff --git a/jOOQ/src/main/java/org/jooq/impl/Lpad.java b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
index fcadb0bd7a..a8e56c163d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Lpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Lpad.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -74,13 +74,13 @@ class Lpad extends AbstractFunction {
             case ASE:
             case SQLSERVER:
             case SYBASE: {
-                return Factory.concat(Factory.repeat(character, length.sub(Factory.length(field))), field);
+                return DSL.concat(DSL.repeat(character, length.sub(DSL.length(field))), field);
             }
 
             // This beautiful expression was contributed by "Ludo", here:
             // http://stackoverflow.com/questions/6576343/how-to-simulate-lpad-rpad-with-sqlite
             case SQLITE: {
-                return Factory.field(
+                return DSL.field(
                     "substr(" +
                       "replace(" +
                         "replace(" +
diff --git a/jOOQ/src/main/java/org/jooq/impl/MD5.java b/jOOQ/src/main/java/org/jooq/impl/MD5.java
index 87279c98b4..65b4f2ec96 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MD5.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MD5.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
+import static org.jooq.impl.DSL.field;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
index 9360ed2742..0ab9611080 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MergeImpl.java
@@ -36,10 +36,10 @@
 package org.jooq.impl;
 
 import static org.jooq.SQLDialect.H2;
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
-import static org.jooq.impl.Factory.nullSafe;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
+import static org.jooq.impl.DSL.nullSafe;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java b/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
index d1a5b1778c..4074d801c1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaDataFieldProvider.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
+import static org.jooq.impl.DSL.field;
 
 import java.io.Serializable;
 import java.sql.ResultSetMetaData;
diff --git a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
index 05e23bd318..9333b33cf9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/MetaImpl.java
@@ -36,7 +36,7 @@
 package org.jooq.impl;
 
 import static org.jooq.SQLDialect.SQLITE;
-import static org.jooq.impl.Factory.fieldByName;
+import static org.jooq.impl.DSL.fieldByName;
 
 import java.io.Serializable;
 import java.sql.Connection;
@@ -79,7 +79,7 @@ class MetaImpl implements Meta, Serializable {
     private transient volatile DatabaseMetaData meta;
 
     MetaImpl(Configuration configuration) {
-        this.create = Factory.using(configuration);
+        this.create = DSL.using(configuration);
         this.configuration = configuration;
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Mod.java b/jOOQ/src/main/java/org/jooq/impl/Mod.java
index e103972751..1164603252 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Mod.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Mod.java
@@ -36,7 +36,7 @@
 package org.jooq.impl;
 
 import static org.jooq.impl.ExpressionOperator.MODULO;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl.java b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
index ff7c860619..2117661ca0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -79,7 +79,7 @@ class Nvl extends AbstractFunction {
                 return function("ifnull", getDataType(), getArguments());
 
             default:
-                return Factory.decode().when(arg1.isNotNull(), arg1).otherwise(arg2);
+                return DSL.decode().when(arg1.isNotNull(), arg1).otherwise(arg2);
         }
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
index 76bebf9a6e..c422417316 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Nvl2.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -72,7 +72,7 @@ class Nvl2 extends AbstractFunction {
                 return function("nvl2", getDataType(), getArguments());
 
             default:
-                return Factory.decode().when(arg1.isNotNull(), arg2).otherwise(arg3);
+                return DSL.decode().when(arg1.isNotNull(), arg2).otherwise(arg3);
         }
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pi.java b/jOOQ/src/main/java/org/jooq/impl/Pi.java
index b8f705530d..c4ec43b600 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pi.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pi.java
@@ -35,10 +35,10 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.two;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.two;
 
 import java.math.BigDecimal;
 
@@ -64,7 +64,7 @@ class Pi extends AbstractFunction {
         switch (configuration.getDialect()) {
             case DB2:
             case ORACLE:
-                return Factory.asin(one()).mul(two());
+                return DSL.asin(one()).mul(two());
 
             case SQLITE:
                 return inline(Math.PI, BigDecimal.class);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Pivot.java b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
index 862642ffe7..dcf995c58e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Pivot.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Pivot.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.trueCondition;
-import static org.jooq.impl.Factory.using;
+import static org.jooq.impl.DSL.trueCondition;
+import static org.jooq.impl.DSL.using;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Position.java b/jOOQ/src/main/java/org/jooq/impl/Position.java
index 457b6a828a..0e3cd97480 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Position.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Position.java
@@ -36,8 +36,8 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Power.java b/jOOQ/src/main/java/org/jooq/impl/Power.java
index 6272973d64..991029f7b4 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Power.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Power.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import java.math.BigDecimal;
 
@@ -67,7 +67,7 @@ class Power extends AbstractFunction {
         switch (configuration.getDialect()) {
             case DERBY:
             case SQLITE:
-                return Factory.exp(Factory.ln(arg1).mul(arg2));
+                return DSL.exp(DSL.ln(arg1).mul(arg2));
 
             default:
                 return function("power", SQLDataType.NUMERIC, getArguments());
diff --git a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
index 2a771f397f..765a491bb2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/QuantifiedSelectImpl.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.table;
+import static org.jooq.impl.DSL.table;
 
 import org.jooq.BindContext;
 import org.jooq.Configuration;
diff --git a/jOOQ/src/main/java/org/jooq/impl/RTrim.java b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
index 9a099ed369..54f9dad8b9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RTrim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RTrim.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Radians.java b/jOOQ/src/main/java/org/jooq/impl/Radians.java
index 8674aff9f2..4b6fb96947 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Radians.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Radians.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.pi;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.pi;
 
 import java.math.BigDecimal;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rand.java b/jOOQ/src/main/java/org/jooq/impl/Rand.java
index 7443525beb..bea0cc1808 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rand.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rand.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import java.math.BigDecimal;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
index c04e12e27a..0bc34e507e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ReferenceImpl.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.row;
+import static org.jooq.impl.DSL.row;
 import static org.jooq.impl.Utils.filterOne;
 import static org.jooq.impl.Utils.first;
 import static org.jooq.impl.Utils.list;
@@ -189,7 +189,7 @@ class ReferenceImpl extends AbstractKey i
         R first = first(records);
 
         if (first instanceof AttachableInternal) {
-            return Factory.using(((AttachableInternal) first).getConfiguration());
+            return DSL.using(((AttachableInternal) first).getConfiguration());
         }
         else {
             throw new DetachedException("Supply at least one attachable record");
diff --git a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
index 65393e1eaf..2737a466c9 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RegexpLike.java
@@ -78,7 +78,7 @@ class RegexpLike extends AbstractCondition {
             case HSQLDB: {
 
                 // [#1570] TODO: Replace this by SQL.condition(String, QueryPart...)
-                context.sql(Factory.condition("{regexp_matches}({0}, {1})", search, pattern));
+                context.sql(DSL.condition("{regexp_matches}({0}, {1})", search, pattern));
                 break;
             }
 
@@ -86,7 +86,7 @@ class RegexpLike extends AbstractCondition {
             case POSTGRES: {
 
                 // [#1570] TODO: Replace this by SQL.condition(String, QueryPart...)
-                context.sql(Factory.condition("{0} ~ {1}", search, pattern));
+                context.sql(DSL.condition("{0} ~ {1}", search, pattern));
                 break;
             }
 
@@ -94,7 +94,7 @@ class RegexpLike extends AbstractCondition {
             case ORACLE: {
 
                 // [#1570] TODO: Replace this by SQL.condition(String, QueryPart...)
-                context.sql(Factory.condition("{regexp_like}({0}, {1})", search, pattern));
+                context.sql(DSL.condition("{regexp_like}({0}, {1})", search, pattern));
                 break;
             }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Repeat.java b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
index b71391fad5..6cb25186f5 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Repeat.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Repeat.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -66,14 +66,14 @@ class Repeat extends AbstractFunction {
             case FIREBIRD:
             case INGRES:
             case ORACLE:
-                return Factory.rpad(string, Factory.length(string).mul(count), string);
+                return DSL.rpad(string, DSL.length(string).mul(count), string);
 
             // Simulation of REPEAT() for SQLite currently cannot be achieved
             // using RPAD() above, as RPAD() expects characters, not strings
             // Another option is documented here, though:
             // http://stackoverflow.com/questions/11568496/how-to-simulate-repeat-in-sqlite
             case SQLITE:
-                return Factory.field("replace(substr(quote(zeroblob(({0} + 1) / 2)), 3, {0}), '0', {1})", String.class, count, string);
+                return DSL.field("replace(substr(quote(zeroblob(({0} + 1) / 2)), 3, {0}), '0', {1})", String.class, count, string);
 
             case ASE:
             case SQLSERVER:
diff --git a/jOOQ/src/main/java/org/jooq/impl/Replace.java b/jOOQ/src/main/java/org/jooq/impl/Replace.java
index feff195063..1bc8c2c760 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Replace.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Replace.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.val;
 import static org.jooq.impl.SQLDataType.VARCHAR;
 
 import org.jooq.Configuration;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rollup.java b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
index db104dabb7..780347469a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rollup.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rollup.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Round.java b/jOOQ/src/main/java/org/jooq/impl/Round.java
index 7a01275339..cf638e5657 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Round.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Round.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.val;
 
 import java.math.BigDecimal;
 
@@ -75,19 +75,19 @@ class Round extends AbstractFunction {
             // evaluate "round" if unavailable
             case DERBY: {
                 if (decimals == 0) {
-                    return Factory.decode()
-                        .when(argument.sub(Factory.floor(argument))
-                        .lessThan((T) Double.valueOf(0.5)), Factory.floor(argument))
-                        .otherwise(Factory.ceil(argument));
+                    return DSL.decode()
+                        .when(argument.sub(DSL.floor(argument))
+                        .lessThan((T) Double.valueOf(0.5)), DSL.floor(argument))
+                        .otherwise(DSL.ceil(argument));
                 }
                 else {
-                    Field factor = Factory.val(BigDecimal.ONE.movePointRight(decimals));
+                    Field factor = DSL.val(BigDecimal.ONE.movePointRight(decimals));
                     Field mul = argument.mul(factor);
 
-                    return Factory.decode()
-                        .when(mul.sub(Factory.floor(mul))
-                        .lessThan((T) Double.valueOf(0.5)), Factory.floor(mul).div(factor))
-                        .otherwise(Factory.ceil(mul).div(factor));
+                    return DSL.decode()
+                        .when(mul.sub(DSL.floor(mul))
+                        .lessThan((T) Double.valueOf(0.5)), DSL.floor(mul).div(factor))
+                        .otherwise(DSL.ceil(mul).div(factor));
                 }
             }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
index 4a657abddd..1a9f2c4eae 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowBetweenCondition.java
@@ -47,7 +47,7 @@ import static org.jooq.SQLDialect.ORACLE;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
 import static org.jooq.SQLDialect.SYBASE;
-import static org.jooq.impl.Factory.row;
+import static org.jooq.impl.DSL.row;
 
 import javax.annotation.Generated;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
index a77c66a5db..fda1891367 100644
--- a/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/RowImpl.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.row;
+import static org.jooq.impl.DSL.row;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Rpad.java b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
index 74c43c14b8..bf7504d776 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Rpad.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Rpad.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -74,13 +74,13 @@ class Rpad extends AbstractFunction {
             case ASE:
             case SQLSERVER:
             case SYBASE: {
-                return Factory.concat(field, Factory.repeat(character, length.sub(Factory.length(field))));
+                return DSL.concat(field, DSL.repeat(character, length.sub(DSL.length(field))));
             }
 
             // This beautiful expression was contributed by "Ludo", here:
             // http://stackoverflow.com/questions/6576343/how-to-simulate-lpad-rpad-with-sqlite
             case SQLITE: {
-                return Factory.field(
+                return DSL.field(
                     "{0} || substr(" +
                              "replace(" +
                                "replace(" +
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
index 0e6d569a26..c69110ea6a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectImpl.java
@@ -35,10 +35,10 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
-import static org.jooq.impl.Factory.table;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
+import static org.jooq.impl.DSL.table;
 
 import java.sql.ResultSet;
 import java.util.Arrays;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 7e1bdf5ab4..6239e23173 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -47,10 +47,10 @@ import static org.jooq.SQLDialect.MYSQL;
 import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.SQLDialect.SQLITE;
 import static org.jooq.SQLDialect.SQLSERVER;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.name;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.rowNumber;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.name;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.rowNumber;
 import static org.jooq.impl.Utils.DATA_ROW_VALUE_EXPRESSION_PREDICATE_SUBQUERY;
 
 import java.util.Arrays;
diff --git a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
index a370906c69..f40991a46f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SequenceImpl.java
@@ -37,7 +37,7 @@ package org.jooq.impl;
 
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.FIREBIRD;
-import static org.jooq.impl.Factory.field;
+import static org.jooq.impl.DSL.field;
 
 import org.jooq.Configuration;
 import org.jooq.DataType;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sign.java b/jOOQ/src/main/java/org/jooq/impl/Sign.java
index 378e31c841..64a4e0252f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sign.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sign.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.zero;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.zero;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -65,7 +65,7 @@ class Sign extends AbstractFunction {
     final Field getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
             case SQLITE:
-                return Factory.decode()
+                return DSL.decode()
                     .when(((Field) argument).greaterThan(zero()), one())
                     .when(((Field) argument).lessThan(zero()), one().neg())
                     .otherwise(zero());
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sinh.java b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
index f613d531c3..eb6f200ea0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sinh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sinh.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.two;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.two;
 
 import java.math.BigDecimal;
 
@@ -73,7 +73,7 @@ class Sinh extends AbstractFunction {
             case POSTGRES:
             case SQLSERVER:
             case SYBASE:
-                return Factory.exp(argument.mul(two())).sub(one()).div(Factory.exp(argument).mul(two()));
+                return DSL.exp(argument.mul(two())).sub(one()).div(DSL.exp(argument).mul(two()));
 
             default:
                 return function("sinh", SQLDataType.NUMERIC, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
index a5e63a21ce..6e7274d274 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SortFieldImpl.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.nvl2;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.zero;
+import static org.jooq.impl.DSL.nvl2;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.zero;
 
 import org.jooq.BindContext;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
index ac2b4fcb4d..6a2f834d8a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Sqrt.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import java.math.BigDecimal;
 
@@ -64,7 +64,7 @@ class Sqrt extends AbstractFunction {
     final Field getFunction0(Configuration configuration) {
         switch (configuration.getDialect()) {
             case SQLITE:
-                return Factory.power(argument, 0.5);
+                return DSL.power(argument, 0.5);
 
             default:
                 return function("sqrt", SQLDataType.NUMERIC, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Substring.java b/jOOQ/src/main/java/org/jooq/impl/Substring.java
index 37a497aabe..24bf84f3ff 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Substring.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Substring.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.inline;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.inline;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Tanh.java b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
index 65852479f9..af4b5fbd95 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Tanh.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Tanh.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.two;
+import static org.jooq.impl.DSL.function;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.two;
 
 import java.math.BigDecimal;
 
@@ -73,7 +73,7 @@ class Tanh extends AbstractFunction {
             case POSTGRES:
             case SQLSERVER:
             case SYBASE:
-                return Factory.exp(argument.mul(two())).sub(one()).div(Factory.exp(argument.mul(two())).add(one()));
+                return DSL.exp(argument.mul(two())).sub(one()).div(DSL.exp(argument.mul(two())).add(one()));
 
             default:
                 return function("tanh", SQLDataType.NUMERIC, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
index 5fa74580af..e0f8c66ab7 100644
--- a/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
+++ b/jOOQ/src/main/java/org/jooq/impl/TimestampDiff.java
@@ -35,8 +35,8 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.function;
 import static org.jooq.impl.SQLDataType.INTEGER;
 
 import java.sql.Timestamp;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trim.java b/jOOQ/src/main/java/org/jooq/impl/Trim.java
index 0e54151a93..0d1d99d64f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trim.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trim.java
@@ -35,7 +35,7 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.function;
+import static org.jooq.impl.DSL.function;
 
 import org.jooq.Configuration;
 import org.jooq.Field;
@@ -64,7 +64,7 @@ class Trim extends AbstractFunction {
             case ASE:
             case INGRES:
             case SQLSERVER:
-                return Factory.ltrim(Factory.rtrim(argument));
+                return DSL.ltrim(DSL.rtrim(argument));
 
             default:
                 return function("trim", SQLDataType.VARCHAR, argument);
diff --git a/jOOQ/src/main/java/org/jooq/impl/Trunc.java b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
index 13defdb641..0ba33a0ba0 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Trunc.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Trunc.java
@@ -36,10 +36,10 @@
 package org.jooq.impl;
 
 import static java.math.BigDecimal.TEN;
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.zero;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.zero;
 import static org.jooq.impl.Utils.extractVal;
 
 import java.math.BigDecimal;
@@ -96,10 +96,10 @@ class Trunc extends AbstractFunction {
                     power = inline(TEN.pow(decimalsVal, MathContext.DECIMAL128));
                 }
                 else {
-                    power = Factory.power(inline(TEN), decimals);
+                    power = DSL.power(inline(TEN), decimals);
                 }
 
-                return Factory.decode()
+                return DSL.decode()
                     .when(field.sign().greaterOrEqual(zero()),
                           field.mul(power).floor().div(power))
                     .otherwise(
diff --git a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
index aeb68b32af..8aa8cb6161 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UDTConstant.java
@@ -36,7 +36,7 @@
 
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.val;
 
 import org.jooq.BindContext;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
index e922ddd733..76428d5aa1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateImpl.java
@@ -35,9 +35,9 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.notExists;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.notExists;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
index 3ab8f23d6b..78155300a1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/UpdateQueryImpl.java
@@ -39,7 +39,7 @@ package org.jooq.impl;
 import static java.util.Arrays.asList;
 import static org.jooq.SQLDialect.INGRES;
 import static org.jooq.SQLDialect.ORACLE;
-import static org.jooq.impl.Factory.select;
+import static org.jooq.impl.DSL.select;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Utils.java b/jOOQ/src/main/java/org/jooq/impl/Utils.java
index aa090dd823..01d1a9b51b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Utils.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Utils.java
@@ -39,10 +39,10 @@ import static java.lang.Boolean.FALSE;
 import static org.jooq.SQLDialect.CUBRID;
 import static org.jooq.SQLDialect.POSTGRES;
 import static org.jooq.impl.DefaultExecuteContext.localConnection;
-import static org.jooq.impl.Factory.escape;
-import static org.jooq.impl.Factory.getDataType;
-import static org.jooq.impl.Factory.nullSafe;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.escape;
+import static org.jooq.impl.DSL.getDataType;
+import static org.jooq.impl.DSL.nullSafe;
+import static org.jooq.impl.DSL.val;
 import static org.jooq.tools.jdbc.JDBCUtils.safeFree;
 import static org.jooq.tools.jdbc.JDBCUtils.wasNull;
 import static org.jooq.tools.reflect.Reflect.accessible;
@@ -895,7 +895,7 @@ final class Utils {
                 else {
                     @SuppressWarnings("unchecked")
                     Class type = (Class) (substitute != null ? substitute.getClass() : Object.class);
-                    result.add(new Val(substitute, Factory.getDataType(type)));
+                    result.add(new Val(substitute, DSL.getDataType(type)));
                 }
             }
 
@@ -1905,7 +1905,7 @@ final class Utils {
         }
         else if (Result.class.isAssignableFrom(type)) {
             ResultSet nested = (ResultSet) rs.getObject(index);
-            return (T) Factory.using(ctx.configuration()).fetch(nested);
+            return (T) DSL.using(ctx.configuration()).fetch(nested);
         }
         else {
             return (T) rs.getObject(index);
@@ -2197,7 +2197,7 @@ final class Utils {
         }
         else if (Result.class.isAssignableFrom(type)) {
             ResultSet nested = (ResultSet) stmt.getObject(index);
-            return (T) Factory.using(ctx.configuration()).fetch(nested);
+            return (T) DSL.using(ctx.configuration()).fetch(nested);
         }
         else {
             return (T) stmt.getObject(index);
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
index c26660df23..b4bf84ceb5 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockFileDatabase.java
@@ -53,7 +53,7 @@ import java.util.regex.Pattern;
 
 import org.jooq.DSLContext;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.tools.JooqLogger;
 
 /**
@@ -132,7 +132,7 @@ public class MockFileDatabase implements MockDataProvider {
         this.encoding = encoding;
         this.matchExactly = new LinkedHashMap>();
         this.matchPattern = new LinkedHashMap>();
-        this.create = Factory.using(SQLDialect.SQL99);
+        this.create = DSL.using(SQLDialect.SQL99);
 
         load();
     }
diff --git a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
index a02ec003ec..df1bab190d 100644
--- a/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
+++ b/jOOQ/src/main/java/org/jooq/tools/jdbc/MockResultSetMetaData.java
@@ -45,7 +45,7 @@ import org.jooq.Field;
 import org.jooq.Schema;
 import org.jooq.Table;
 import org.jooq.TableField;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.types.UNumber;
 
 /**
@@ -169,7 +169,7 @@ public class MockResultSetMetaData implements ResultSetMetaData, Serializable {
                     Schema mapped = null;
 
                     if (configuration != null) {
-                        mapped = Factory.using(configuration).map(schema);
+                        mapped = DSL.using(configuration).map(schema);
                     }
 
                     if (mapped != null) {
diff --git a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java b/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
index 139a74c696..9e9d2ac8c5 100644
--- a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
@@ -31,14 +31,14 @@
 package org.jooq.util.ase;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#ASE} specific factory
  *
  * @author Lukas Eder
  */
-public class ASEFactory extends Factory {
+public class ASEFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java
index eaf0876741..df3d237bc3 100644
--- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java
@@ -32,14 +32,14 @@ package org.jooq.util.cubrid;
 
 import org.jooq.Field;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#CUBRID} specific factory
  *
  * @author Lukas Eder
  */
-public class CUBRIDFactory extends Factory {
+public class CUBRIDFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java b/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
index a8e379979e..9fcd07c17a 100644
--- a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.db2;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#DB2} specific factory
  *
  * @author Lukas Eder
  */
-public class DB2Factory extends Factory {
+public class DB2Factory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java b/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
index 9d9382e00d..0760a51d4f 100644
--- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.derby;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#DERBY} specific factory
  *
  * @author Lukas Eder
  */
-public class DerbyFactory extends Factory {
+public class DerbyFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java
index f9f2f41fe5..5bbb30b9e2 100644
--- a/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/firebird/FirebirdFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.firebird;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#FIREBIRD} specific factory
  *
  * @author Lukas Eder
  */
-public class FirebirdFactory extends Factory {
+public class FirebirdFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java b/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
index 85f2038d6c..a3cf027ce6 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.h2;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#H2} specific factory
  *
  * @author Lukas Eder
  */
-public class H2Factory extends Factory {
+public class H2Factory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
index 2ee86e7c58..6ab75905e4 100644
--- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.hsqldb;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#HSQLDB} specific factory
  *
  * @author Lukas Eder
  */
-public class HSQLDBFactory extends Factory {
+public class HSQLDBFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java b/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
index 26e4588592..66ad771af3 100644
--- a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.ingres;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#INGRES} specific factory
  *
  * @author Lukas Eder
  */
-public class IngresFactory extends Factory {
+public class IngresFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
index 664f06ade7..534d50a43a 100644
--- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
@@ -38,14 +38,14 @@ package org.jooq.util.mysql;
 import org.jooq.EnumType;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#MYSQL} specific factory
  *
  * @author Lukas Eder
  */
-public class MySQLFactory extends Factory {
+public class MySQLFactory extends DSL {
 
     /**
      * No instances
@@ -60,7 +60,7 @@ public class MySQLFactory extends Factory {
     /**
      * Get the MySQL-specific DECODE() function
      * 

-     * Don't mix this up with the various {@link Factory#decode()} methods!
+     * Don't mix this up with the various {@link DSL#decode()} methods!
      */
     public static Field decode(String cryptString, String keyString) {
         return decode(val(cryptString), val(keyString));
@@ -69,7 +69,7 @@ public class MySQLFactory extends Factory {
     /**
      * Get the MySQL-specific DECODE() function
      * 

-     * Don't mix this up with the various {@link Factory#decode()} methods!
+     * Don't mix this up with the various {@link DSL#decode()} methods!
      */
     public static Field decode(Field cryptString, Field keyString) {
         return function("decode", String.class, cryptString, keyString);
diff --git a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java b/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
index 0be09d8710..6ea42dbc85 100644
--- a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
@@ -42,7 +42,7 @@ import java.math.BigDecimal;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.Support;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.impl.SQLDataType;
 
 /**
@@ -50,7 +50,7 @@ import org.jooq.impl.SQLDataType;
  *
  * @author Lukas Eder
  */
-public class OracleFactory extends Factory {
+public class OracleFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
index 47951586de..f9f3289272 100644
--- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.postgres;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#POSTGRES} specific factory
  *
  * @author Lukas Eder
  */
-public class PostgresFactory extends Factory {
+public class PostgresFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
index a0fb2cc5b1..0731c5a6b8 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
@@ -37,14 +37,14 @@ package org.jooq.util.sqlite;
 
 import org.jooq.Field;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#SQLITE} specific factory
  *
  * @author Lukas Eder
  */
-public class SQLiteFactory extends Factory {
+public class SQLiteFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
index 9030839355..d3be29073c 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
@@ -36,14 +36,14 @@
 package org.jooq.util.sqlserver;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#SQLSERVER} specific factory
  *
  * @author Lukas Eder
  */
-public class SQLServerFactory extends Factory {
+public class SQLServerFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
index 3b336d8a85..bb8afb1635 100644
--- a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
@@ -31,14 +31,14 @@
 package org.jooq.util.sybase;
 
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 
 /**
  * A {@link SQLDialect#SYBASE} specific factory
  *
  * @author Espen Stromsnes
  */
-public class SybaseFactory extends Factory {
+public class SybaseFactory extends DSL {
 
     /**
      * No instances
diff --git a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
index 68ddd7086b..214bd411b6 100644
--- a/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/AbstractTest.java
@@ -49,7 +49,7 @@ import org.jooq.DSLContext;
 import org.jooq.RenderContext;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.test.data.Table1Record;
 import org.jooq.util.oracle.OracleDataType;
 
@@ -84,7 +84,7 @@ public abstract class AbstractTest {
     public void setUp() throws Exception {
         context = new Mockery();
         statement = context.mock(PreparedStatement.class);
-        create = Factory.using(SQLDialect.ORACLE);
+        create = DSL.using(SQLDialect.ORACLE);
 
         resultEmpty = create.newResult(TABLE1);
 
diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
index 067e4796bb..ee03e1e4be 100644
--- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java
@@ -38,31 +38,31 @@ package org.jooq.test;
 
 import static junit.framework.Assert.assertEquals;
 import static org.jooq.JoinType.LEFT_OUTER_JOIN;
-import static org.jooq.impl.Factory.any;
-import static org.jooq.impl.Factory.avg;
-import static org.jooq.impl.Factory.condition;
-import static org.jooq.impl.Factory.count;
-import static org.jooq.impl.Factory.countDistinct;
-import static org.jooq.impl.Factory.decode;
-import static org.jooq.impl.Factory.exists;
-import static org.jooq.impl.Factory.falseCondition;
-import static org.jooq.impl.Factory.field;
-import static org.jooq.impl.Factory.fieldByName;
-import static org.jooq.impl.Factory.inline;
-import static org.jooq.impl.Factory.max;
-import static org.jooq.impl.Factory.min;
-import static org.jooq.impl.Factory.not;
-import static org.jooq.impl.Factory.one;
-import static org.jooq.impl.Factory.param;
-import static org.jooq.impl.Factory.replace;
-import static org.jooq.impl.Factory.round;
-import static org.jooq.impl.Factory.row;
-import static org.jooq.impl.Factory.select;
-import static org.jooq.impl.Factory.selectOne;
-import static org.jooq.impl.Factory.sum;
-import static org.jooq.impl.Factory.tableByName;
-import static org.jooq.impl.Factory.trueCondition;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.any;
+import static org.jooq.impl.DSL.avg;
+import static org.jooq.impl.DSL.condition;
+import static org.jooq.impl.DSL.count;
+import static org.jooq.impl.DSL.countDistinct;
+import static org.jooq.impl.DSL.decode;
+import static org.jooq.impl.DSL.exists;
+import static org.jooq.impl.DSL.falseCondition;
+import static org.jooq.impl.DSL.field;
+import static org.jooq.impl.DSL.fieldByName;
+import static org.jooq.impl.DSL.inline;
+import static org.jooq.impl.DSL.max;
+import static org.jooq.impl.DSL.min;
+import static org.jooq.impl.DSL.not;
+import static org.jooq.impl.DSL.one;
+import static org.jooq.impl.DSL.param;
+import static org.jooq.impl.DSL.replace;
+import static org.jooq.impl.DSL.round;
+import static org.jooq.impl.DSL.row;
+import static org.jooq.impl.DSL.select;
+import static org.jooq.impl.DSL.selectOne;
+import static org.jooq.impl.DSL.sum;
+import static org.jooq.impl.DSL.tableByName;
+import static org.jooq.impl.DSL.trueCondition;
+import static org.jooq.impl.DSL.val;
 import static org.jooq.test.data.Table1.FIELD_DATE1;
 import static org.jooq.test.data.Table1.FIELD_ID1;
 import static org.jooq.test.data.Table1.FIELD_NAME1;
@@ -120,7 +120,7 @@ import org.jooq.conf.RenderKeywordStyle;
 import org.jooq.conf.RenderNameStyle;
 import org.jooq.impl.CustomCondition;
 import org.jooq.impl.CustomField;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.impl.SQLDataType;
 import org.jooq.test.data.Table1Record;
 
@@ -199,329 +199,329 @@ public class BasicTest extends AbstractTest {
         // Standalone functions created from the factory
         // ---------------------------------------------
         assertEquals(
-            Factory.abs((Integer) null),
-            Factory.abs((Field) null));
+            DSL.abs((Integer) null),
+            DSL.abs((Field) null));
         assertEquals(
-            Factory.acos((Integer) null),
-            Factory.acos((Field) null));
+            DSL.acos((Integer) null),
+            DSL.acos((Field) null));
         assertEquals(
-            Factory.asin((Integer) null),
-            Factory.asin((Field) null));
+            DSL.asin((Integer) null),
+            DSL.asin((Field) null));
         assertEquals(
-            Factory.atan((Integer) null),
-            Factory.atan((Field) null));
+            DSL.atan((Integer) null),
+            DSL.atan((Field) null));
         assertEquals(
-            Factory.atan2((Integer) null, (Integer) null),
-            Factory.atan2((Field) null, (Field) null));
+            DSL.atan2((Integer) null, (Integer) null),
+            DSL.atan2((Field) null, (Field) null));
         assertEquals(
-            Factory.atan2((Integer) null, (Integer) null),
-            Factory.atan2((Field) null, (Integer) null));
+            DSL.atan2((Integer) null, (Integer) null),
+            DSL.atan2((Field) null, (Integer) null));
         assertEquals(
-            Factory.atan2((Integer) null, (Integer) null),
-            Factory.atan2((Integer) null, (Field) null));
+            DSL.atan2((Integer) null, (Integer) null),
+            DSL.atan2((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitAnd((Integer) null, (Integer) null),
-            Factory.bitAnd((Integer) null, (Field) null));
+            DSL.bitAnd((Integer) null, (Integer) null),
+            DSL.bitAnd((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitAnd((Integer) null, (Integer) null),
-            Factory.bitAnd((Field) null, (Integer) null));
+            DSL.bitAnd((Integer) null, (Integer) null),
+            DSL.bitAnd((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitAnd((Integer) null, (Integer) null),
-            Factory.bitAnd((Field) null, (Field) null));
+            DSL.bitAnd((Integer) null, (Integer) null),
+            DSL.bitAnd((Field) null, (Field) null));
         assertEquals(
-            Factory.bitCount((Integer) null),
-            Factory.bitCount((Field) null));
+            DSL.bitCount((Integer) null),
+            DSL.bitCount((Field) null));
         assertEquals(
-            Factory.bitLength((String) null),
-            Factory.bitLength((Field) null));
+            DSL.bitLength((String) null),
+            DSL.bitLength((Field) null));
         assertEquals(
-            Factory.bitNand((Integer) null, (Integer) null),
-            Factory.bitNand((Integer) null, (Field) null));
+            DSL.bitNand((Integer) null, (Integer) null),
+            DSL.bitNand((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitNand((Integer) null, (Integer) null),
-            Factory.bitNand((Field) null, (Integer) null));
+            DSL.bitNand((Integer) null, (Integer) null),
+            DSL.bitNand((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitNand((Integer) null, (Integer) null),
-            Factory.bitNand((Field) null, (Field) null));
+            DSL.bitNand((Integer) null, (Integer) null),
+            DSL.bitNand((Field) null, (Field) null));
         assertEquals(
-            Factory.bitNor((Integer) null, (Integer) null),
-            Factory.bitNor((Integer) null, (Field) null));
+            DSL.bitNor((Integer) null, (Integer) null),
+            DSL.bitNor((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitNor((Integer) null, (Integer) null),
-            Factory.bitNor((Field) null, (Integer) null));
+            DSL.bitNor((Integer) null, (Integer) null),
+            DSL.bitNor((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitNor((Integer) null, (Integer) null),
-            Factory.bitNor((Field) null, (Field) null));
+            DSL.bitNor((Integer) null, (Integer) null),
+            DSL.bitNor((Field) null, (Field) null));
         assertEquals(
-            Factory.bitOr((Integer) null, (Integer) null),
-            Factory.bitOr((Integer) null, (Field) null));
+            DSL.bitOr((Integer) null, (Integer) null),
+            DSL.bitOr((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitOr((Integer) null, (Integer) null),
-            Factory.bitOr((Field) null, (Integer) null));
+            DSL.bitOr((Integer) null, (Integer) null),
+            DSL.bitOr((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitOr((Integer) null, (Integer) null),
-            Factory.bitOr((Field) null, (Field) null));
+            DSL.bitOr((Integer) null, (Integer) null),
+            DSL.bitOr((Field) null, (Field) null));
         assertEquals(
-            Factory.bitXNor((Integer) null, (Integer) null),
-            Factory.bitXNor((Integer) null, (Field) null));
+            DSL.bitXNor((Integer) null, (Integer) null),
+            DSL.bitXNor((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitXNor((Integer) null, (Integer) null),
-            Factory.bitXNor((Field) null, (Integer) null));
+            DSL.bitXNor((Integer) null, (Integer) null),
+            DSL.bitXNor((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitXNor((Integer) null, (Integer) null),
-            Factory.bitXNor((Field) null, (Field) null));
+            DSL.bitXNor((Integer) null, (Integer) null),
+            DSL.bitXNor((Field) null, (Field) null));
         assertEquals(
-            Factory.bitXor((Integer) null, (Integer) null),
-            Factory.bitXor((Integer) null, (Field) null));
+            DSL.bitXor((Integer) null, (Integer) null),
+            DSL.bitXor((Integer) null, (Field) null));
         assertEquals(
-            Factory.bitXor((Integer) null, (Integer) null),
-            Factory.bitXor((Field) null, (Integer) null));
+            DSL.bitXor((Integer) null, (Integer) null),
+            DSL.bitXor((Field) null, (Integer) null));
         assertEquals(
-            Factory.bitXor((Integer) null, (Integer) null),
-            Factory.bitXor((Field) null, (Field) null));
+            DSL.bitXor((Integer) null, (Integer) null),
+            DSL.bitXor((Field) null, (Field) null));
         assertEquals(
-            Factory.ceil((Integer) null),
-            Factory.ceil((Field) null));
+            DSL.ceil((Integer) null),
+            DSL.ceil((Field) null));
         assertEquals(
-            Factory.charLength((String) null),
-            Factory.charLength((Field) null));
+            DSL.charLength((String) null),
+            DSL.charLength((Field) null));
         assertEquals(
-            Factory.coalesce((Integer) null, (Integer) null),
-            Factory.coalesce((Field) null, (Field) null));
+            DSL.coalesce((Integer) null, (Integer) null),
+            DSL.coalesce((Field) null, (Field) null));
         assertEquals(
-            Factory.coalesce((Integer) null, (Integer) null, (Integer) null),
-            Factory.coalesce((Field) null, (Field) null, (Field) null));
+            DSL.coalesce((Integer) null, (Integer) null, (Integer) null),
+            DSL.coalesce((Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.coalesce((Integer) null, (Integer) null, (Integer[]) null),
-            Factory.coalesce((Field) null, (Field) null, (Field[]) null));
+            DSL.coalesce((Integer) null, (Integer) null, (Integer[]) null),
+            DSL.coalesce((Field) null, (Field) null, (Field[]) null));
         assertEquals(
-            Factory.coalesce((Integer) null, (Integer) null, (Integer) null, (Integer) null),
-            Factory.coalesce((Field) null, (Field) null, (Field) null, (Field) null));
+            DSL.coalesce((Integer) null, (Integer) null, (Integer) null, (Integer) null),
+            DSL.coalesce((Field) null, (Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.concat((String) null, (String) null),
-            Factory.concat((Field) null, (Field) null));
+            DSL.concat((String) null, (String) null),
+            DSL.concat((Field) null, (Field) null));
         assertEquals(
-            Factory.cos((Integer) null),
-            Factory.cos((Field) null));
+            DSL.cos((Integer) null),
+            DSL.cos((Field) null));
         assertEquals(
-            Factory.cosh((Integer) null),
-            Factory.cosh((Field) null));
+            DSL.cosh((Integer) null),
+            DSL.cosh((Field) null));
         assertEquals(
-            Factory.cot((Integer) null),
-            Factory.cot((Field) null));
+            DSL.cot((Integer) null),
+            DSL.cot((Field) null));
         assertEquals(
-            Factory.coth((Integer) null),
-            Factory.coth((Field) null));
+            DSL.coth((Integer) null),
+            DSL.coth((Field) null));
         assertEquals(
-            Factory.dateAdd((Date) null, (Integer) null),
-            Factory.dateAdd((Field) null, (Field) null));
+            DSL.dateAdd((Date) null, (Integer) null),
+            DSL.dateAdd((Field) null, (Field) null));
         assertEquals(
-            Factory.dateDiff((Date) null, (Date) null),
-            Factory.dateDiff((Field) null, (Field) null));
+            DSL.dateDiff((Date) null, (Date) null),
+            DSL.dateDiff((Field) null, (Field) null));
         assertEquals(
-            Factory.day((java.util.Date) null),
-            Factory.day((Field) null));
+            DSL.day((java.util.Date) null),
+            DSL.day((Field) null));
         assertEquals(
-            Factory.decode((Integer) null, null, null),
-            Factory.decode((Field) null, null, null));
+            DSL.decode((Integer) null, null, null),
+            DSL.decode((Field) null, null, null));
         assertEquals(
-            Factory.decode((Integer) null, null, null),
-            Factory.decode((Field) null, null, null));
+            DSL.decode((Integer) null, null, null),
+            DSL.decode((Field) null, null, null));
         assertEquals(
-            Factory.deg((Integer) null),
-            Factory.deg((Field) null));
+            DSL.deg((Integer) null),
+            DSL.deg((Field) null));
         assertEquals(
-            Factory.exp((Integer) null),
-            Factory.exp((Field) null));
+            DSL.exp((Integer) null),
+            DSL.exp((Field) null));
         assertEquals(
-            Factory.extract((java.util.Date) null, DatePart.DAY),
-            Factory.extract((Field) null, DatePart.DAY));
+            DSL.extract((java.util.Date) null, DatePart.DAY),
+            DSL.extract((Field) null, DatePart.DAY));
         assertEquals(
-            Factory.floor((Integer) null),
-            Factory.floor((Field) null));
+            DSL.floor((Integer) null),
+            DSL.floor((Field) null));
         assertEquals(
-            Factory.greatest((Integer) null),
-            Factory.greatest((Field) null));
+            DSL.greatest((Integer) null),
+            DSL.greatest((Field) null));
         assertEquals(
-            Factory.greatest((Integer) null, (Integer[]) null),
-            Factory.greatest((Field) null, (Field[]) null));
+            DSL.greatest((Integer) null, (Integer[]) null),
+            DSL.greatest((Field) null, (Field[]) null));
         assertEquals(
-            Factory.greatest((Integer) null, (Integer) null, (Integer) null),
-            Factory.greatest((Field) null, (Field) null, (Field) null));
+            DSL.greatest((Integer) null, (Integer) null, (Integer) null),
+            DSL.greatest((Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.greatest((Integer) null, (Integer) null),
-            Factory.greatest((Field) null, (Field) null));
+            DSL.greatest((Integer) null, (Integer) null),
+            DSL.greatest((Field) null, (Field) null));
         assertEquals(
-            Factory.hour((java.util.Date) null),
-            Factory.hour((Field) null));
+            DSL.hour((java.util.Date) null),
+            DSL.hour((Field) null));
         assertEquals(
-            Factory.lag((Field) null, 1, (Integer) null),
-            Factory.lag((Field) null, 1, (Field) null));
+            DSL.lag((Field) null, 1, (Integer) null),
+            DSL.lag((Field) null, 1, (Field) null));
         assertEquals(
-            Factory.lead((Field) null, 1, (Integer) null),
-            Factory.lead((Field) null, 1, (Field) null));
+            DSL.lead((Field) null, 1, (Integer) null),
+            DSL.lead((Field) null, 1, (Field) null));
         assertEquals(
-            Factory.least((Integer) null),
-            Factory.least((Field) null));
+            DSL.least((Integer) null),
+            DSL.least((Field) null));
         assertEquals(
-            Factory.least((Integer) null, (Integer) null),
-            Factory.least((Field) null, (Field) null));
+            DSL.least((Integer) null, (Integer) null),
+            DSL.least((Field) null, (Field) null));
         assertEquals(
-            Factory.least((Integer) null, (Integer[]) null),
-            Factory.least((Field) null, (Field[]) null));
+            DSL.least((Integer) null, (Integer[]) null),
+            DSL.least((Field) null, (Field[]) null));
         assertEquals(
-            Factory.least((Integer) null, (Integer) null, (Integer) null),
-            Factory.least((Field) null, (Field) null, (Field) null));
+            DSL.least((Integer) null, (Integer) null, (Integer) null),
+            DSL.least((Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.length((String) null),
-            Factory.length((Field) null));
+            DSL.length((String) null),
+            DSL.length((Field) null));
         assertEquals(
-            Factory.ln((Integer) null),
-            Factory.ln((Field) null));
+            DSL.ln((Integer) null),
+            DSL.ln((Field) null));
         assertEquals(
-            Factory.log((Integer) null, 2),
-            Factory.log((Field) null, 2));
+            DSL.log((Integer) null, 2),
+            DSL.log((Field) null, 2));
         assertEquals(
-            Factory.lower((String) null),
-            Factory.lower((Field) null));
+            DSL.lower((String) null),
+            DSL.lower((Field) null));
         assertEquals(
-            Factory.ltrim((String) null),
-            Factory.ltrim((Field) null));
+            DSL.ltrim((String) null),
+            DSL.ltrim((Field) null));
         assertEquals(
-            Factory.minute((java.util.Date) null),
-            Factory.minute((Field) null));
+            DSL.minute((java.util.Date) null),
+            DSL.minute((Field) null));
         assertEquals(
-            Factory.month((java.util.Date) null),
-            Factory.month((Field) null));
+            DSL.month((java.util.Date) null),
+            DSL.month((Field) null));
         assertEquals(
-            Factory.nullif((Integer) null, (Integer) null),
-            Factory.nullif((Field) null, (Integer) null));
+            DSL.nullif((Integer) null, (Integer) null),
+            DSL.nullif((Field) null, (Integer) null));
         assertEquals(
-            Factory.nullif((Integer) null, (Integer) null),
-            Factory.nullif((Integer) null, (Field) null));
+            DSL.nullif((Integer) null, (Integer) null),
+            DSL.nullif((Integer) null, (Field) null));
         assertEquals(
-            Factory.nullif((Integer) null, (Integer) null),
-            Factory.nullif((Field) null, (Field) null));
+            DSL.nullif((Integer) null, (Integer) null),
+            DSL.nullif((Field) null, (Field) null));
         assertEquals(
-            Factory.nvl((Integer) null, (Integer) null),
-            Factory.nvl((Integer) null, (Field) null));
+            DSL.nvl((Integer) null, (Integer) null),
+            DSL.nvl((Integer) null, (Field) null));
         assertEquals(
-            Factory.nvl((Integer) null, (Integer) null),
-            Factory.nvl((Field) null, (Integer) null));
+            DSL.nvl((Integer) null, (Integer) null),
+            DSL.nvl((Field) null, (Integer) null));
         assertEquals(
-            Factory.nvl((Integer) null, (Integer) null),
-            Factory.nvl((Field) null, (Field) null));
+            DSL.nvl((Integer) null, (Integer) null),
+            DSL.nvl((Field) null, (Field) null));
         assertEquals(
-            Factory.nvl2((Field) null, (Integer) null, (Integer) null),
-            Factory.nvl2((Field) null, (Field) null, (Integer) null));
+            DSL.nvl2((Field) null, (Integer) null, (Integer) null),
+            DSL.nvl2((Field) null, (Field) null, (Integer) null));
         assertEquals(
-            Factory.nvl2((Field) null, (Integer) null, (Integer) null),
-            Factory.nvl2((Field) null, (Integer) null, (Field) null));
+            DSL.nvl2((Field) null, (Integer) null, (Integer) null),
+            DSL.nvl2((Field) null, (Integer) null, (Field) null));
         assertEquals(
-            Factory.nvl2((Field) null, (Integer) null, (Integer) null),
-            Factory.nvl2((Field) null, (Field) null, (Field) null));
+            DSL.nvl2((Field) null, (Integer) null, (Integer) null),
+            DSL.nvl2((Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.octetLength((String) null),
-            Factory.octetLength((Field) null));
+            DSL.octetLength((String) null),
+            DSL.octetLength((Field) null));
         assertEquals(
-            Factory.position((String) null, (String) null),
-            Factory.position((String) null, (Field) null));
+            DSL.position((String) null, (String) null),
+            DSL.position((String) null, (Field) null));
         assertEquals(
-            Factory.position((String) null, (String) null),
-            Factory.position((Field) null, (String) null));
+            DSL.position((String) null, (String) null),
+            DSL.position((Field) null, (String) null));
         assertEquals(
-            Factory.position((String) null, (String) null),
-            Factory.position((Field) null, (Field) null));
+            DSL.position((String) null, (String) null),
+            DSL.position((Field) null, (Field) null));
         assertEquals(
-            Factory.power((Integer) null, (Integer) null),
-            Factory.power((Field) null, (Field) null));
+            DSL.power((Integer) null, (Integer) null),
+            DSL.power((Field) null, (Field) null));
         assertEquals(
-            Factory.power((Integer) null, (Integer) null),
-            Factory.power((Field) null, (Integer) null));
+            DSL.power((Integer) null, (Integer) null),
+            DSL.power((Field) null, (Integer) null));
         assertEquals(
-            Factory.power((Integer) null, (Integer) null),
-            Factory.power((Integer) null, (Field) null));
+            DSL.power((Integer) null, (Integer) null),
+            DSL.power((Integer) null, (Field) null));
         assertEquals(
-            Factory.rad((Integer) null),
-            Factory.rad((Field) null));
+            DSL.rad((Integer) null),
+            DSL.rad((Field) null));
         assertEquals(
-            Factory.repeat((String) null, (Field) null),
-            Factory.repeat((Field) null, (Field) null));
+            DSL.repeat((String) null, (Field) null),
+            DSL.repeat((Field) null, (Field) null));
         assertEquals(
-            Factory.replace((Field) null, (String) null),
-            Factory.replace((Field) null, (Field) null));
+            DSL.replace((Field) null, (String) null),
+            DSL.replace((Field) null, (Field) null));
         assertEquals(
-            Factory.replace((Field) null, (String) null, (String) null),
-            Factory.replace((Field) null, (Field) null, (Field) null));
+            DSL.replace((Field) null, (String) null, (String) null),
+            DSL.replace((Field) null, (Field) null, (Field) null));
         assertEquals(
-            Factory.round((Integer) null),
-            Factory.round((Field) null));
+            DSL.round((Integer) null),
+            DSL.round((Field) null));
         assertEquals(
-            Factory.round((Integer) null, 1),
-            Factory.round((Field) null, 1));
+            DSL.round((Integer) null, 1),
+            DSL.round((Field) null, 1));
         assertEquals(
-            Factory.rtrim((String) null),
-            Factory.rtrim((Field) null));
+            DSL.rtrim((String) null),
+            DSL.rtrim((Field) null));
         assertEquals(
-            Factory.second((java.util.Date) null),
-            Factory.second((Field) null));
+            DSL.second((java.util.Date) null),
+            DSL.second((Field) null));
         assertEquals(
-            Factory.shl((Integer) null, (Integer) null),
-            Factory.shl((Integer) null, (Field) null));
+            DSL.shl((Integer) null, (Integer) null),
+            DSL.shl((Integer) null, (Field) null));
         assertEquals(
-            Factory.shl((Integer) null, (Integer) null),
-            Factory.shl((Field) null, (Integer) null));
+            DSL.shl((Integer) null, (Integer) null),
+            DSL.shl((Field) null, (Integer) null));
         assertEquals(
-            Factory.shl((Integer) null, (Integer) null),
-            Factory.shl((Field) null, (Field) null));
+            DSL.shl((Integer) null, (Integer) null),
+            DSL.shl((Field) null, (Field) null));
         assertEquals(
-            Factory.shr((Integer) null, (Integer) null),
-            Factory.shr((Integer) null, (Field) null));
+            DSL.shr((Integer) null, (Integer) null),
+            DSL.shr((Integer) null, (Field) null));
         assertEquals(
-            Factory.shr((Integer) null, (Integer) null),
-            Factory.shr((Field) null, (Integer) null));
+            DSL.shr((Integer) null, (Integer) null),
+            DSL.shr((Field) null, (Integer) null));
         assertEquals(
-            Factory.shr((Integer) null, (Integer) null),
-            Factory.shr((Field) null, (Field) null));
+            DSL.shr((Integer) null, (Integer) null),
+            DSL.shr((Field) null, (Field) null));
         assertEquals(
-            Factory.sign((Integer) null),
-            Factory.sign((Field) null));
+            DSL.sign((Integer) null),
+            DSL.sign((Field) null));
         assertEquals(
-            Factory.sin((Integer) null),
-            Factory.sin((Field) null));
+            DSL.sin((Integer) null),
+            DSL.sin((Field) null));
         assertEquals(
-            Factory.sinh((Integer) null),
-            Factory.sinh((Field) null));
+            DSL.sinh((Integer) null),
+            DSL.sinh((Field) null));
         assertEquals(
-            Factory.sqrt((Integer) null),
-            Factory.sqrt((Field) null));
+            DSL.sqrt((Integer) null),
+            DSL.sqrt((Field) null));
         assertEquals(
-            Factory.tan((Integer) null),
-            Factory.tan((Field) null));
+            DSL.tan((Integer) null),
+            DSL.tan((Field) null));
         assertEquals(
-            Factory.tanh((Integer) null),
-            Factory.tanh((Field) null));
+            DSL.tanh((Integer) null),
+            DSL.tanh((Field) null));
         assertEquals(
-            Factory.timestampAdd((Timestamp) null, (Integer) null),
-            Factory.timestampAdd((Field) null, (Field) null));
+            DSL.timestampAdd((Timestamp) null, (Integer) null),
+            DSL.timestampAdd((Field) null, (Field) null));
         assertEquals(
-            Factory.timestampDiff((Timestamp) null, (Timestamp) null),
-            Factory.timestampDiff((Field) null, (Field) null));
+            DSL.timestampDiff((Timestamp) null, (Timestamp) null),
+            DSL.timestampDiff((Field) null, (Field) null));
 //        assertEquals(
 //            SQL.trunc((Timestamp) null, null),
 //            SQL.trunc((Field) null, null));
         assertEquals(
-            Factory.trunc((Integer) null, null),
-            Factory.trunc((Field) null, null));
+            DSL.trunc((Integer) null, null),
+            DSL.trunc((Field) null, null));
         assertEquals(
-            Factory.trim((String) null),
-            Factory.trim((Field) null));
+            DSL.trim((String) null),
+            DSL.trim((Field) null));
         assertEquals(
-            Factory.upper((String) null),
-            Factory.upper((Field) null));
+            DSL.upper((String) null),
+            DSL.upper((Field) null));
         assertEquals(
-            Factory.year((java.util.Date) null),
-            Factory.year((Field) null));
+            DSL.year((java.util.Date) null),
+            DSL.year((Field) null));
     }
 
     @Test
diff --git a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
index 43e6dbf882..9fa763a61e 100644
--- a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java
@@ -38,7 +38,7 @@ package org.jooq.test;
 
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
-import static org.jooq.impl.Factory.fieldByName;
+import static org.jooq.impl.DSL.fieldByName;
 
 import java.sql.Timestamp;
 
diff --git a/jOOQ/src/test/java/org/jooq/test/MockTest.java b/jOOQ/src/test/java/org/jooq/test/MockTest.java
index b66b172645..7294ec43ae 100644
--- a/jOOQ/src/test/java/org/jooq/test/MockTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/MockTest.java
@@ -39,7 +39,7 @@ import static java.util.Arrays.asList;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNull;
 import static junit.framework.Assert.fail;
-import static org.jooq.impl.Factory.val;
+import static org.jooq.impl.DSL.val;
 import static org.jooq.test.data.Table1.FIELD_ID1;
 import static org.jooq.test.data.Table1.FIELD_NAME1;
 import static org.jooq.test.data.Table1.TABLE1;
@@ -57,7 +57,7 @@ import org.jooq.Record2;
 import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.exception.DataAccessException;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.test.data.Table1;
 import org.jooq.test.data.Table1Record;
 import org.jooq.tools.jdbc.MockConnection;
@@ -81,12 +81,12 @@ public class MockTest extends AbstractTest {
     @BeforeClass
     public static void before() throws Exception {
         File file = new File(MockTest.class.getResource("/org/jooq/test/data/db.txt").toURI());
-        MOCK = Factory.using(new MockConnection(new MockFileDatabase(file)), SQLDialect.ORACLE);
+        MOCK = DSL.using(new MockConnection(new MockFileDatabase(file)), SQLDialect.ORACLE);
     }
 
     @Test
     public void testEmptyResult() {
-        DSLContext e = Factory.using(new MockConnection(new EmptyResult()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new EmptyResult()), SQLDialect.H2);
         Result result = e.fetch("select ?, ? from dual", 1, 2);
 
         assertEquals(0, result.size());
@@ -110,7 +110,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testSingleResult() {
-        DSLContext e = Factory.using(new MockConnection(new SingleResult()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new SingleResult()), SQLDialect.H2);
         Result result = e.fetch("select ?, ? from dual", 1, 2);
 
         assertEquals(1, result.size());
@@ -139,7 +139,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testDoubleResult() {
-        DSLContext e = Factory.using(new MockConnection(new DoubleResult()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new DoubleResult()), SQLDialect.H2);
         List> result = e.fetchMany("select ?, ? from dual", 1, 2);
 
         assertEquals(2, result.size());
@@ -192,7 +192,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testBatchSingle() {
-        DSLContext e = Factory.using(new MockConnection(new BatchSingle()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new BatchSingle()), SQLDialect.H2);
 
         int[] result =
         e.batch(
@@ -226,7 +226,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testBatchMultiple() {
-        DSLContext e = Factory.using(new MockConnection(new BatchMultiple()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new BatchMultiple()), SQLDialect.H2);
 
         Query query = e.query("insert into x values(?, ?)", null, null);
 
@@ -263,7 +263,7 @@ public class MockTest extends AbstractTest {
 
     @Test
     public void testException() {
-        DSLContext e = Factory.using(new MockConnection(new Exceptional()), SQLDialect.H2);
+        DSLContext e = DSL.using(new MockConnection(new Exceptional()), SQLDialect.H2);
 
         Query query = e.query("insert into x values(1)");
 
@@ -288,7 +288,7 @@ public class MockTest extends AbstractTest {
     public void testInsertReturning() {
 
         // Note: INSERT .. RETURNING is hard to mock for all dialects...
-        DSLContext e = Factory.using(new MockConnection(new InsertReturning()), SQLDialect.ORACLE);
+        DSLContext e = DSL.using(new MockConnection(new InsertReturning()), SQLDialect.ORACLE);
 
         InsertResultStep query = e
             .insertInto(TABLE1, FIELD_ID1)
diff --git a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
index 54bed4e0dd..f9bcf68671 100644
--- a/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
+++ b/jOOQ/src/test/java/org/jooq/test/SettingsTest.java
@@ -50,7 +50,7 @@ import org.jooq.conf.MappedTable;
 import org.jooq.conf.RenderMapping;
 import org.jooq.conf.Settings;
 import org.jooq.conf.SettingsTools;
-import org.jooq.impl.Factory;
+import org.jooq.impl.DSL;
 import org.jooq.impl.SchemaImpl;
 import org.jooq.impl.TableImpl;
 
@@ -88,23 +88,23 @@ public class SettingsTest {
         Schema schema = new SchemaImpl("S");
         Table table = new TableImpl("T", schema);
 
-        DSLContext create0 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create0 = DSL.using(SQLDialect.ORACLE);
         assertEquals("\"S\".\"T\"", create0.render(table));
 
-        DSLContext create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderSchema(false));
+        DSLContext create1 = DSL.using(SQLDialect.ORACLE, new Settings().withRenderSchema(false));
         assertEquals("\"T\"", create1.render(table));
 
-        DSLContext create2 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create2 = DSL.using(SQLDialect.ORACLE);
         create2.configuration().getSettings().setRenderSchema(false);
         assertEquals("\"T\"", create2.render(table));
     }
 
     @Test
     public void testRenderMapping() {
-        DSLContext create1 = Factory.using(SQLDialect.ORACLE, new Settings().withRenderMapping(mapping()));
+        DSLContext create1 = DSL.using(SQLDialect.ORACLE, new Settings().withRenderMapping(mapping()));
         assertEquals("\"TABLEX\"", create1.render(TABLE1));
 
-        DSLContext create2 = Factory.using(SQLDialect.ORACLE);
+        DSLContext create2 = DSL.using(SQLDialect.ORACLE);
         create2.configuration().getSettings().setRenderMapping(mapping());
         assertEquals("\"TABLEX\"", create2.render(TABLE1));
     }