From 202065f013f673051ebaabcecb073db204738344 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Thu, 19 Jul 2012 19:34:28 +0200
Subject: [PATCH] [#1586] Add missing constructors taking DataSource to
 dialect-specific factories

---
 .../java/org/jooq/util/ase/ASEFactory.java    | 24 +++++++++++++++++++
 .../org/jooq/util/cubrid/CUBRIDFactory.java   | 24 +++++++++++++++++++
 .../java/org/jooq/util/db2/DB2Factory.java    | 24 +++++++++++++++++++
 .../org/jooq/util/derby/DerbyFactory.java     | 24 +++++++++++++++++++
 .../main/java/org/jooq/util/h2/H2Factory.java | 24 +++++++++++++++++++
 .../org/jooq/util/hsqldb/HSQLDBFactory.java   | 24 +++++++++++++++++++
 .../org/jooq/util/ingres/IngresFactory.java   | 24 +++++++++++++++++++
 .../org/jooq/util/mysql/MySQLFactory.java     | 24 +++++++++++++++++++
 .../org/jooq/util/oracle/OracleFactory.java   | 24 +++++++++++++++++++
 .../jooq/util/postgres/PostgresFactory.java   | 24 +++++++++++++++++++
 .../org/jooq/util/sqlite/SQLiteFactory.java   | 24 +++++++++++++++++++
 .../jooq/util/sqlserver/SQLServerFactory.java | 24 +++++++++++++++++++
 .../org/jooq/util/sybase/SybaseFactory.java   | 24 +++++++++++++++++++
 13 files changed, 312 insertions(+)

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 42872fe47c..882c2b0404 100644
--- a/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ase/ASEFactory.java
@@ -32,6 +32,8 @@ package org.jooq.util.ase;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -77,6 +79,18 @@ public class ASEFactory extends Factory {
         super(connection, SQLDialect.ASE, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public ASEFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.ASE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -87,6 +101,16 @@ public class ASEFactory extends Factory {
         super(connection, SQLDialect.ASE);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public ASEFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.ASE);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 953476e711..27e1f862a3 100644
--- a/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/cubrid/CUBRIDFactory.java
@@ -32,6 +32,8 @@ package org.jooq.util.cubrid;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
@@ -76,6 +78,18 @@ public class CUBRIDFactory extends Factory {
         super(connection, SQLDialect.CUBRID, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public CUBRIDFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.CUBRID, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -86,6 +100,16 @@ public class CUBRIDFactory extends Factory {
         super(connection, SQLDialect.CUBRID);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public CUBRIDFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.CUBRID);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 69d3a8e1d3..ac096f4037 100644
--- a/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/db2/DB2Factory.java
@@ -37,6 +37,8 @@ package org.jooq.util.db2;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class DB2Factory extends Factory {
         super(connection, SQLDialect.DB2, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public DB2Factory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.DB2, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class DB2Factory extends Factory {
         super(connection, SQLDialect.DB2);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public DB2Factory(DataSource dataSource) {
+        super(dataSource, SQLDialect.DB2);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 daed30cab0..1644d3c4ad 100644
--- a/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/derby/DerbyFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.derby;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class DerbyFactory extends Factory {
         super(connection, SQLDialect.DERBY, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public DerbyFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.DERBY, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class DerbyFactory extends Factory {
         super(connection, SQLDialect.DERBY);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public DerbyFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.DERBY);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 af6b29a180..57a802a6b8 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2Factory.java
@@ -37,6 +37,8 @@ package org.jooq.util.h2;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class H2Factory extends Factory {
         super(connection, SQLDialect.H2, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public H2Factory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.H2, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class H2Factory extends Factory {
         super(connection, SQLDialect.H2);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public H2Factory(DataSource dataSource) {
+        super(dataSource, SQLDialect.H2);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 4e4b7f49a5..f32ea2e63a 100644
--- a/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/hsqldb/HSQLDBFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.hsqldb;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class HSQLDBFactory extends Factory {
         super(connection, SQLDialect.HSQLDB, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public HSQLDBFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.HSQLDB, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class HSQLDBFactory extends Factory {
         super(connection, SQLDialect.HSQLDB);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public HSQLDBFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.HSQLDB);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 ae87713246..7a9cf3328e 100644
--- a/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/ingres/IngresFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.ingres;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class IngresFactory extends Factory {
         super(connection, SQLDialect.INGRES, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public IngresFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.INGRES, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class IngresFactory extends Factory {
         super(connection, SQLDialect.INGRES);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public IngresFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.INGRES);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 5468bbcb5b..644d1a3684 100644
--- a/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/mysql/MySQLFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.mysql;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.EnumType;
 import org.jooq.Field;
 import org.jooq.SQLDialect;
@@ -84,6 +86,18 @@ public class MySQLFactory extends Factory {
         super(connection, SQLDialect.MYSQL, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public MySQLFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.MYSQL, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -94,6 +108,16 @@ public class MySQLFactory extends Factory {
         super(connection, SQLDialect.MYSQL);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public MySQLFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.MYSQL);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 85ccf24638..5cc936a0dc 100644
--- a/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/oracle/OracleFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.oracle;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
@@ -84,6 +86,18 @@ public class OracleFactory extends Factory {
         super(connection, SQLDialect.ORACLE, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public OracleFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.ORACLE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -94,6 +108,16 @@ public class OracleFactory extends Factory {
         super(connection, SQLDialect.ORACLE);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public OracleFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.ORACLE);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 158e6f84f6..44eb38ac8c 100644
--- a/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/postgres/PostgresFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.postgres;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class PostgresFactory extends Factory {
         super(connection, SQLDialect.POSTGRES, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public PostgresFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.POSTGRES, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class PostgresFactory extends Factory {
         super(connection, SQLDialect.POSTGRES);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public PostgresFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.POSTGRES);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 ec4f48f1fb..6f4c3d1324 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlite/SQLiteFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.sqlite;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.Field;
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
@@ -83,6 +85,18 @@ public class SQLiteFactory extends Factory {
         super(connection, SQLDialect.SQLITE, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SQLiteFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.SQLITE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -93,6 +107,16 @@ public class SQLiteFactory extends Factory {
         super(connection, SQLDialect.SQLITE);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public SQLiteFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.SQLITE);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 2d8334f840..12a6425dc2 100644
--- a/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sqlserver/SQLServerFactory.java
@@ -37,6 +37,8 @@ package org.jooq.util.sqlserver;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -82,6 +84,18 @@ public class SQLServerFactory extends Factory {
         super(connection, SQLDialect.SQLSERVER, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SQLServerFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.SQLSERVER, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -92,6 +106,16 @@ public class SQLServerFactory extends Factory {
         super(connection, SQLDialect.SQLSERVER);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public SQLServerFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.SQLSERVER);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>
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 7bd6e481c2..bb9e74a4ee 100644
--- a/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/sybase/SybaseFactory.java
@@ -32,6 +32,8 @@ package org.jooq.util.sybase;
 
 import java.sql.Connection;
 
+import javax.sql.DataSource;
+
 import org.jooq.SQLDialect;
 import org.jooq.SchemaMapping;
 import org.jooq.conf.Settings;
@@ -77,6 +79,18 @@ public class SybaseFactory extends Factory {
         super(connection, SQLDialect.SYBASE, settings);
     }
 
+    /**
+     * Create a factory with a data source and a settings configured
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     * @param settings The runtime settings to apply to objects created from
+     *            this factory
+     */
+    public SybaseFactory(DataSource dataSource, Settings settings) {
+        super(dataSource, SQLDialect.SYBASE, settings);
+    }
+
     /**
      * Create a factory with connection
      *
@@ -87,6 +101,16 @@ public class SybaseFactory extends Factory {
         super(connection, SQLDialect.SYBASE);
     }
 
+    /**
+     * Create a factory with a data source
+     *
+     * @param dataSource The data source to use with objects created from this
+     *            factory
+     */
+    public SybaseFactory(DataSource dataSource) {
+        super(dataSource, SQLDialect.SYBASE);
+    }
+
     /**
      * Create a factory with settings configured
      * <p>