diff --git a/framework/build.xml b/framework/build.xml
index 516feec6e5..ce38f846dc 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -283,26 +283,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
index 782c1075c8..6ccb21d7ac 100644
--- a/framework/dependencies.yml
+++ b/framework/dependencies.yml
@@ -8,8 +8,6 @@ transitiveDependencies: false
# This core dependencies are required by Play framework
require: &allDependencies
- antlr 2.7.7
- - com.mchange -> c3p0 0.9.5.5
- - com.zaxxer -> HikariCP 5.1.0
- org.ow2.asm -> asm 9.6
- org.ow2.asm -> asm-commons 9.6
- org.ow2.asm -> asm-util 9.6
@@ -29,7 +27,6 @@ require: &allDependencies
- org.apache.commons -> commons-text 1.11.0
- commons-logging 1.3.0
- org.dom4j -> dom4j 2.1.4
- - com.h2database -> h2 1.4.200
- javax.activation -> javax.activation-api 1.2.0
- com.sun.mail -> javax.mail 1.6.2
- jakarta.inject -> jakarta.inject-api 1.0
@@ -56,11 +53,7 @@ require: &allDependencies
- org.codehaus.groovy -> groovy-xml 3.0.20
- org.eclipse.jdt -> org.eclipse.jdt.core 3.33.0
- org.eclipse.jdt -> ecj 3.33.0
- - org.hibernate -> hibernate-core 5.6.5.Final.patched
- net.bytebuddy -> byte-buddy 1.14.12
- - javax.persistence -> javax.persistence-api 2.2
- - org.hibernate.common -> hibernate-commons-annotations 5.1.2.Final
- - org.hibernate -> hibernate-validator 5.4.3.Final
- io.smallrye -> jandex 3.1.6
- org.jboss.logging -> jboss-logging 3.5.3.Final
- org.jboss.spec.javax.transaction -> jboss-transaction-api_1.2_spec 1.1.1.Final
@@ -68,8 +61,6 @@ require: &allDependencies
- javax.xml.bind -> jaxb-api 2.3.1
- org.glassfish.jaxb -> jaxb-runtime 2.3.9
- com.fasterxml -> classmate 1.7.0
- - org.hibernate -> hibernate-c3p0 5.6.15.Final
- - org.hibernate -> hibernate-ehcache 5.6.15.Final
- com.mchange -> mchange-commons-java 0.2.20
- org.javassist -> javassist 3.30.2-GA
- io.netty -> netty 3.10.6.Final
@@ -80,7 +71,7 @@ require: &allDependencies
- net.spy -> spymemcached 2.12.3
- com.thoughtworks.xstream -> xstream 1.4.20
- xmlpull 1.1.3.4d_b4_min
- - org.apache.logging.log4j -> log4j-web 2.18.0
+
# Default repositories, used for all projects
repositories:
diff --git a/framework/gradle/wrapper/gradle-wrapper.jar b/framework/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..d64cd49177
Binary files /dev/null and b/framework/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/framework/gradle/wrapper/gradle-wrapper.properties b/framework/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..1af9e0930b
--- /dev/null
+++ b/framework/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/framework/lib/commons-collections-3.2.2.jar b/framework/lib/commons-collections-3.2.2.jar
deleted file mode 100644
index fa5df82a63..0000000000
Binary files a/framework/lib/commons-collections-3.2.2.jar and /dev/null differ
diff --git a/framework/src/play.plugins b/framework/src/play.plugins
index 9ceb7f1fc1..bca273a62e 100644
--- a/framework/src/play.plugins
+++ b/framework/src/play.plugins
@@ -2,10 +2,6 @@
1:play.ConfigurationChangeWatcherPlugin
100:play.data.parsing.TempFilePlugin
200:play.data.validation.ValidationPlugin
-300:play.db.DBPlugin
-301:play.db.DBBrowserPlugin
-400:play.db.jpa.JPAPlugin
-450:play.db.Evolutions
500:play.i18n.MessagesPlugin
600:play.libs.WS
700:play.jobs.JobsPlugin
diff --git a/framework/src/play/PlayPlugin.java b/framework/src/play/PlayPlugin.java
index ccdebe9f0e..e012daba4f 100644
--- a/framework/src/play/PlayPlugin.java
+++ b/framework/src/play/PlayPlugin.java
@@ -14,7 +14,6 @@
import play.classloading.ApplicationClasses.ApplicationClass;
import play.data.binding.RootParamNode;
-import play.db.Model;
import play.libs.F;
import play.mvc.Http.Request;
import play.mvc.Http.Response;
@@ -416,15 +415,6 @@ public void compileAll(List classes) {
public void routeRequest(Request request) {
}
- /**
- * @param modelClass
- * class of the model
- * @return the Model factory
- */
- public Model.Factory modelFactory(Class modelClass) {
- return null;
- }
-
public void afterFixtureLoad() {
}
diff --git a/framework/src/play/data/binding/AnnotationHelper.java b/framework/src/play/data/binding/AnnotationHelper.java
index ec1f904124..e0b7bf2c3f 100644
--- a/framework/src/play/data/binding/AnnotationHelper.java
+++ b/framework/src/play/data/binding/AnnotationHelper.java
@@ -11,7 +11,6 @@
import play.data.binding.types.DateBinder;
import play.i18n.Lang;
import play.libs.I18N;
-import play.test.Fixtures;
public class AnnotationHelper {
@@ -37,10 +36,7 @@ public static Date getDateAs(Annotation[] annotations, String value) throws Pars
Locale locale = Lang.getLocale();
String format = as.value()[0];
// According to Binder.java line 328 : Fixtures can use (iso) dates as default
- if (format != null && format.equals(Fixtures.PROFILE_NAME)) {
- format = DateBinder.ISO8601;
- locale = null;
- } else if (!StringUtils.isEmpty(format)) {
+ if (!StringUtils.isEmpty(format)) {
// This can be comma separated
Tuple tuple = getLocale(as.lang());
if (tuple != null) {
diff --git a/framework/src/play/data/binding/Binder.java b/framework/src/play/data/binding/Binder.java
index 3a8b775a19..ef1cf88773 100644
--- a/framework/src/play/data/binding/Binder.java
+++ b/framework/src/play/data/binding/Binder.java
@@ -40,7 +40,6 @@ public abstract class Binder {
supportedTypes.put(LocalDateTime.class, new LocalDateTimeBinder());
supportedTypes.put(LocalDate.class, new LocalDateBinder());
supportedTypes.put(LocalTime.class, new LocalTimeBinder());
- supportedTypes.put(Model.BinaryField.class, new BinaryBinder());
supportedTypes.put(Upload.class, new UploadBinder());
supportedTypes.put(Upload[].class, new UploadArrayBinder());
supportedTypes.put(Calendar.class, new CalendarBinder());
diff --git a/framework/src/play/data/binding/types/BinaryBinder.java b/framework/src/play/data/binding/types/BinaryBinder.java
deleted file mode 100644
index 50bfaa67b8..0000000000
--- a/framework/src/play/data/binding/types/BinaryBinder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package play.data.binding.types;
-
-import play.data.binding.Binder;
-import play.data.binding.TypeBinder;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.List;
-import play.data.Upload;
-import play.db.Model;
-import play.exceptions.UnexpectedException;
-import play.mvc.Http.Request;
-import play.mvc.Scope.Params;
-
-public class BinaryBinder implements TypeBinder {
-
- @SuppressWarnings("unchecked")
- @Override
- public Object bind(String name, Annotation[] annotations, String value, Class actualClass, Type genericType) {
- if (value == null || value.trim().length() == 0) {
- return null;
- }
- try {
- Request req = Request.current();
- if (req != null && req.args != null) {
- Model.BinaryField b = (Model.BinaryField) actualClass.newInstance();
- List uploads = (List) req.args.get("__UPLOADS");
- if(uploads != null){
- for (Upload upload : uploads) {
- if (upload.getFieldName().equals(value) && upload.getFileName().trim().length() > 0) {
- b.set(upload.asStream(), upload.getContentType());
- return b;
- }
- }
- }
- }
-
- if (Params.current() != null && Params.current().get(value + "_delete_") != null) {
- return null;
- }
- return Binder.MISSING;
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-}
diff --git a/framework/src/play/data/validation/Unique.java b/framework/src/play/data/validation/Unique.java
deleted file mode 100644
index 70e1d8f98a..0000000000
--- a/framework/src/play/data/validation/Unique.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package play.data.validation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import net.sf.oval.configuration.annotation.Constraint;
-import play.db.jpa.GenericModel;
-
-/**
- * Check that a field or or field in a context is unique.
- * You set the context as a list (comma, semicolon or space separated)
- * of properties of your {@link GenericModel}.
- *
- * Message key: validation.unique
- * $1: field name
- * $2: properties which define a context in which the column must be unique
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.FIELD, ElementType.PARAMETER})
-@Constraint(checkWith = UniqueCheck.class)
-public @interface Unique {
- String value() default "";
- String message() default UniqueCheck.mes;
-}
\ No newline at end of file
diff --git a/framework/src/play/data/validation/UniqueCheck.java b/framework/src/play/data/validation/UniqueCheck.java
deleted file mode 100755
index fc4613616d..0000000000
--- a/framework/src/play/data/validation/UniqueCheck.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package play.data.validation;
-
-import net.sf.oval.Validator;
-import net.sf.oval.configuration.annotation.AbstractAnnotationCheck;
-import net.sf.oval.context.FieldContext;
-import net.sf.oval.context.OValContext;
-import play.db.jpa.GenericModel;
-import play.db.jpa.JPQL;
-import play.db.jpa.Model;
-import play.exceptions.UnexpectedException;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Check which proof if one or a set of properties is unique.
- *
- */
-public class UniqueCheck extends AbstractAnnotationCheck {
-
- static final String mes = "validation.unique";
- private String uniqueKeyContext = null;
-
- @Override
- public void configure(Unique constraintAnnotation) {
- uniqueKeyContext = constraintAnnotation.value();
- setMessage(constraintAnnotation.message());
- }
-
- @Override
- public Map createMessageVariables() {
- Map messageVariables = new TreeMap<>();
- messageVariables.put("2-properties", uniqueKeyContext);
- return messageVariables;
- }
-
- private String[] getPropertyNames(String uniqueKey) {
- String completeUniqueKey;
- if (uniqueKeyContext.length() > 0) {
- completeUniqueKey = uniqueKeyContext + ";" + uniqueKey;
- } else {
- completeUniqueKey = uniqueKey;
- }
- return completeUniqueKey.split("[,;\\s][\\s]*");
- }
-
- /**
- *
- * {@inheritDoc}
- */
- @Override
- public boolean isSatisfied(Object validatedObject, Object value,
- OValContext context, Validator validator) {
- requireMessageVariablesRecreation();
- if (value == null) {
- return true;
- }
- String[] propertyNames = getPropertyNames(
- ((FieldContext) context).getField().getName());
- GenericModel model = (GenericModel) validatedObject;
- Model.Factory factory = Model.Manager.factoryFor(model.getClass());
- String keyProperty = factory.keyName();
- Object keyValue = factory.keyValue(model);
- //In case of an update make sure that we won't read the current record from database.
- boolean isUpdate = (keyValue != null);
- String entityName = model.getClass().getName();
- StringBuilder jpql = new StringBuilder("SELECT COUNT(o) FROM ");
- jpql.append(entityName).append(" AS o where ");
- Object[] values = new Object[isUpdate ? propertyNames.length + 1 :
- propertyNames.length];
- Class clazz = validatedObject.getClass();
- int index = 1;
- for (int i = 0; i < propertyNames.length; i++) {
- Field field = getField(clazz, propertyNames[i]);
- field.setAccessible(true);
- try {
- values[i] = field.get(model);
- } catch (Exception ex) {
- throw new UnexpectedException(ex);
- }
- if (i > 0) {
- jpql.append(" And ");
- }
- jpql.append("o.").append(propertyNames[i]).append(" = ?").append(String.valueOf(index++)).append(" ");
- }
- if (isUpdate) {
- values[propertyNames.length] = keyValue;
- jpql.append(" and o.").append(keyProperty).append(" <> ?").append(String.valueOf(index++)).append(" ");
- }
- return JPQL.instance.count(entityName, jpql.toString(), values) == 0L;
- }
-
- private Field getField(Class clazz, String fieldName) {
- Class c = clazz;
- try {
- while (!c.equals(Object.class)) {
- try {
- return c.getDeclaredField(fieldName);
- } catch (NoSuchFieldException e) {
- c = c.getSuperclass();
- }
- }
- } catch (Exception e) {
- throw new UnexpectedException("Error while determining the field " +
- fieldName + " for an object of type " + clazz, e);
- }
- throw new UnexpectedException("Cannot get the field " + fieldName +
- " for an object of type " + clazz);
- }
-}
\ No newline at end of file
diff --git a/framework/src/play/db/Configuration.java b/framework/src/play/db/Configuration.java
deleted file mode 100644
index 5adc079fce..0000000000
--- a/framework/src/play/db/Configuration.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package play.db;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-
-import jregex.Matcher;
-import jregex.Pattern;
-import play.Play;
-
-public class Configuration {
-
- /** definition of regex to filter db related settings. */
- final String regexDbRelatedSettings = "^(db|javax\\.persistence|jpa|(?:org\\.)?hibernate){1}";
-
- /** compiled regex as a pattern for reuse to filter all db related settings. */
- final java.util.regex.Pattern compiledRegexDbRelatedSettings = java.util.regex.Pattern.compile(regexDbRelatedSettings +".*");
-
- public final String configName;
-
- public boolean isDefault() {
- return DB.DEFAULT.equals(this.configName);
- }
-
- public Configuration(String configurationName) {
- this.configName = configurationName;
- }
-
- public static Set getDbNames() {
- TreeSet dbNames = new TreeSet<>();
- // search for case db= or db.url= as at least one of these property is required
- String DB_CONFIG_PATTERN = "^db\\.([^\\.]*)$|^db\\.([^\\.]*)\\.url$";
- Pattern pattern = new jregex.Pattern(DB_CONFIG_PATTERN);
-
- // List of properties with 2 words
- List dbProperties = Arrays.asList("db.driver", "db.url", "db.user", "db.pass", "db.isolation", "db.destroyMethod",
- "db.testquery", "db.factory");
-
- for (String property : Play.configuration.stringPropertyNames()) {
- Matcher m = pattern.matcher(property);
- if (m.matches() && !dbProperties.contains(property)) {
- String dbName = (m.group(1) != null ? m.group(1) : m.group(2));
- dbNames.add(dbName);
- }
- // Special case db=... and
- if ("db".equals(property) || "db.url".equals(property)) {
- dbNames.add("default");
- }
- }
- return new TreeSet<>(dbNames);
- }
-
- public String getProperty(String key) {
- return this.getProperty(key, null);
- }
-
- public String getProperty(String key, String defaultString) {
- if (key != null) {
- String newKey = generateKey(key);
- Object value = Play.configuration.get(newKey);
- if (value == null && this.isDefault()) {
- value = Play.configuration.get(key);
- }
- if (value != null) {
- return value.toString();
- }
- }
-
- return defaultString;
- }
-
- /**
- * Add a parameter in the configuration
- *
- * @param key
- * the key of the parameter
- * @param value
- * the value of the parameter
- * @return the previous value of the specified key in this hashtable, or null if it did not have one
- */
- public Object put(String key, String value) {
- if (key != null) {
- return Play.configuration.put(generateKey(key), value);
- }
- return null;
- }
-
- String generateKey(String key) {
- Pattern pattern = new Pattern(regexDbRelatedSettings + "(\\.?[\\da-zA-Z\\.-_]*)$");
- Matcher m = pattern.matcher(key);
- if (m.matches()) {
- return m.group(1) + "." + this.configName + m.group(2);
- }
- return key;
- }
-
- public Map getProperties() {
- Map properties = new HashMap<>();
- Properties props = Play.configuration;
-
- for (Object key : Collections.list(props.keys())) {
- String keyName = key.toString();
-
- final java.util.regex.Matcher matcher = compiledRegexDbRelatedSettings.matcher(keyName);
- if (matcher.matches()) {
- final String key_prefix_for_db_related_setting = matcher.group(1);
- if (keyName.startsWith(key_prefix_for_db_related_setting + "." + this.configName)) {
- String newKey = key_prefix_for_db_related_setting;
- if (keyName.length() > (key_prefix_for_db_related_setting + "." + this.configName).length()) {
- newKey += "." + keyName.substring((key_prefix_for_db_related_setting + "." + this.configName).length() + 1);
- }
- properties.put(newKey, props.get(key).toString());
- } else if (this.isDefault()) {
- boolean isDefaultProperty = true;
- Set dBNames = Configuration.getDbNames();
- for (String dbName : dBNames) {
- if (keyName.startsWith("db." + dbName) ||
- keyName.startsWith("hibernate." + dbName)) {
- isDefaultProperty = false;
- break;
- }
- }
- if (isDefaultProperty) {
- properties.put(keyName, props.get(key).toString());
- }
- }
- }
- }
- return properties;
- }
-}
diff --git a/framework/src/play/db/DB.java b/framework/src/play/db/DB.java
deleted file mode 100644
index 8c2de5eaee..0000000000
--- a/framework/src/play/db/DB.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package play.db;
-
-import java.lang.reflect.Method;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.sql.DataSource;
-import javax.sql.RowSet;
-import javax.sql.rowset.CachedRowSet;
-import javax.sql.rowset.RowSetProvider;
-
-import org.hibernate.internal.SessionImpl;
-
-import play.Logger;
-import play.db.jpa.JPA;
-import play.exceptions.DatabaseException;
-
-/**
- * Database connection utilities.
- */
-public class DB {
-
- /**
- * The loaded datasource.
- *
- * @see ExtendedDatasource
- */
- protected static final Map datasources = new ConcurrentHashMap<>();
-
- public static class ExtendedDatasource {
-
- /**
- * Connection to the physical data source
- */
- private final DataSource datasource;
-
- /**
- * The method used to destroy the data source
- */
- private final String destroyMethod;
-
- public ExtendedDatasource(DataSource ds, String destroyMethod) {
- this.datasource = ds;
- this.destroyMethod = destroyMethod;
- }
-
- public String getDestroyMethod() {
- return destroyMethod;
- }
-
- public DataSource getDataSource() {
- return datasource;
- }
-
- }
-
- /**
- * @deprecated Use datasources instead
- * @since 1.3.0
- * @see #datasources
- * @see ExtendedDatasource
- */
- @Deprecated
- public static DataSource datasource = null;
- /**
- * The method used to destroy the datasource
- *
- * @deprecated Use datasources instead
- * @since 1.3.0
- * @see #datasources
- * @see ExtendedDatasource
- */
- @Deprecated
- public static String destroyMethod = "";
-
- public static final String DEFAULT = "default";
-
- static final ThreadLocal> localConnection = new ThreadLocal<>();
-
- public static DataSource getDataSource(String name) {
- ExtendedDatasource datasource = datasources.get(name);
- return datasource == null ? null : datasource.getDataSource();
- }
-
- public static DataSource getDataSource() {
- return getDataSource(DEFAULT);
- }
-
- public static Connection getConnection(String name, boolean autocommit) {
- try {
- Connection connection = getDataSource(name).getConnection();
- connection.setAutoCommit(autocommit);
- return connection;
- } catch (Exception e) {
- // Exception
- throw new DatabaseException(e.getMessage());
- }
- }
-
- private static Connection getLocalConnection(String name) {
- Map map = localConnection.get();
- if (map != null) {
- return map.get(name);
- }
- return null;
- }
-
- private static void registerLocalConnection(String name, Connection connection) {
- Map map = localConnection.get();
- if (map == null) {
- map = new HashMap<>();
- localConnection.set(map);
- }
- map.put(name, connection);
- }
-
- /**
- * Close all the open connections for the current thread.
- */
- public static void closeAll() {
- Map map = localConnection.get();
- if (map != null) {
- Set keySet = new HashSet<>(map.keySet());
- for (String name : keySet) {
- close(name);
- }
- }
- }
-
- /**
- * Close all the open connections for the current thread.
- */
- public static void close() {
- close(DEFAULT);
- }
-
- /**
- * Close a given open connections for the current thread
- *
- * @param name
- * Name of the DB
- */
- public static void close(String name) {
- Map map = localConnection.get();
- if (map != null) {
- Connection connection = map.remove(name);
- if (connection != null) {
- try {
- connection.close();
- } catch (Exception e) {
- throw new DatabaseException("It's possible than the connection '" + name + "'was not properly closed !", e);
- }
- }
- }
- }
-
- /**
- * Open a connection for the current thread.
- *
- * @param name
- * Name of the DB
- * @return A valid SQL connection
- */
- public static Connection getConnection(String name) {
- try {
- if (JPA.isEnabled()) {
- return JPA.em(name).unwrap(SessionImpl.class).getSession().connection();
- }
-
- Connection localConnection = getLocalConnection(name);
- if (localConnection != null) {
- return localConnection;
- }
-
- // We have no connection
- DataSource ds = getDataSource(name);
- if (ds == null) {
- throw new DatabaseException("No database found. Check the configuration of your application.");
- }
- Connection connection = ds.getConnection();
- registerLocalConnection(name, connection);
- return connection;
- } catch (Exception e) {
- // Exception
- throw new DatabaseException(e.getMessage());
- }
- }
-
- public static Connection getConnection() {
- return getConnection(DEFAULT);
- }
-
- /**
- * Execute an SQL update
- *
- * @param name
- * the DB name
- * @param SQL
- * the SQL statement
- * @return true if the next result is a ResultSet object; false if it is an update count or there are no more
- * results
- */
- public static boolean execute(String name, String SQL) {
- Statement statement = null;
- try {
- statement = getConnection(name).createStatement();
- if (statement != null) {
- return statement.execute(SQL);
- }
- } catch (SQLException ex) {
- throw new DatabaseException(ex.getMessage(), ex);
- } finally {
- safeCloseStatement(statement);
- }
- return false;
- }
-
- /**
- * Execute an SQL update
- *
- * @param SQL
- * the SQL statement
- * @return true if the next result is a ResultSet object; false if it is an update count or there are no more
- * results
- */
- public static boolean execute(String SQL) {
- return execute(DEFAULT, SQL);
- }
-
- /**
- * Execute an SQL query
- *
- * @param SQL
- * the SQL statement
- * @return The ResultSet object; false if it is an update count or there are no more results
- */
- public static RowSet executeQuery(String SQL) {
- return executeQuery(DEFAULT, SQL);
- }
-
- /**
- * Execute an SQL query
- *
- * @param name
- * the DB name
- * @param SQL
- * the SQL statement
- * @return The rowSet of the query
- */
- public static RowSet executeQuery(String name, String SQL) {
- Statement statement = null;
- ResultSet rs = null;
- try {
- statement = getConnection(name).createStatement();
- if (statement != null) {
- rs = statement.executeQuery(SQL);
- }
-
- // Need to use a CachedRowSet that caches its rows in memory, which
- // makes it possible to operate without always being connected to
- // its data source
- CachedRowSet rowset = RowSetProvider.newFactory().createCachedRowSet();
- rowset.populate(rs);
- return rowset;
- } catch (SQLException ex) {
- throw new DatabaseException(ex.getMessage(), ex);
- } finally {
- safeCloseResultSet(rs);
- safeCloseStatement(statement);
- }
- }
-
- public static void safeCloseResultSet(ResultSet resultSet) {
- if (resultSet != null) {
- try {
- resultSet.close();
- } catch (SQLException ex) {
- throw new DatabaseException(ex.getMessage(), ex);
- }
- }
- }
-
- public static void safeCloseStatement(Statement statement) {
- if (statement != null) {
- try {
- statement.close();
- } catch (SQLException ex) {
- throw new DatabaseException(ex.getMessage(), ex);
- }
- }
- }
-
- /**
- * Destroy the datasource
- *
- * @param name
- * the DB name
- */
- public static void destroy(String name) {
- try {
- ExtendedDatasource extDatasource = datasources.get(name);
- if (extDatasource != null && extDatasource.getDestroyMethod() != null) {
- Method close = extDatasource.datasource.getClass().getMethod(extDatasource.getDestroyMethod());
- close.invoke(extDatasource.getDataSource());
- datasources.remove(name);
- DB.datasource = null;
- Logger.trace("Datasource destroyed");
- }
- } catch (Throwable t) {
- Logger.error("Couldn't destroy the datasource", t);
- }
- }
-
- /**
- * Destroy the datasource
- */
- public static void destroy() {
- destroy(DEFAULT);
- }
-
- /**
- * Destroy all datasources
- */
- public static void destroyAll() {
- Set keySet = new HashSet<>(datasources.keySet());
- for (String name : keySet) {
- destroy(name);
- }
- }
-}
diff --git a/framework/src/play/db/DBBrowserPlugin.java b/framework/src/play/db/DBBrowserPlugin.java
deleted file mode 100644
index 90e41da36a..0000000000
--- a/framework/src/play/db/DBBrowserPlugin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package play.db;
-
-import org.h2.tools.Server;
-import play.Play;
-import play.PlayPlugin;
-import play.mvc.Http;
-import play.mvc.Http.Request;
-import play.mvc.Http.Response;
-
-public class DBBrowserPlugin extends PlayPlugin {
-
- private Server h2Server;
-
- @Override
- public void onConfigurationRead() {
- if (!Play.mode.isDev()) {
- Play.pluginCollection.disablePlugin(this);
- }
- }
-
- @Override
- public boolean rawInvocation(Request request, Response response) throws Exception {
- if (request.path.equals("/@db")) {
- response.status = Http.StatusCode.FOUND;
- String serverOptions[] = new String[] { };
-
- // For H2 embedded database, we'll also start the Web console
- if (h2Server != null) {
- h2Server.stop();
- }
-
- String domain = request.domain;
- if (domain.equals("")) {
- domain = "localhost";
- }
-
- if (!domain.equals("localhost")) {
- serverOptions = new String[] {"-webAllowOthers"};
- }
-
- h2Server = Server.createWebServer(serverOptions);
- h2Server.start();
-
- response.setHeader("Location", "http://" + domain + ":8082/");
- return true;
- }
- return false;
- }
-}
diff --git a/framework/src/play/db/DBPlugin.java b/framework/src/play/db/DBPlugin.java
deleted file mode 100644
index 9c04d9ae8c..0000000000
--- a/framework/src/play/db/DBPlugin.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package play.db;
-
-import jregex.Matcher;
-import org.apache.commons.lang3.StringUtils;
-import play.Logger;
-import play.Play;
-import play.PlayPlugin;
-import play.db.DB.ExtendedDatasource;
-import play.exceptions.DatabaseException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import java.io.File;
-import java.sql.*;
-import java.util.*;
-
-public class DBPlugin extends PlayPlugin {
-
- public static String url = "";
-
- protected DataSourceFactory factory(Configuration dbConfig) {
- String dbFactory = dbConfig.getProperty("db.factory", "play.db.hikaricp.HikariDataSourceFactory");
- try {
- return (DataSourceFactory) Class.forName(dbFactory).newInstance();
- }
- catch (Exception e) {
- throw new IllegalArgumentException("Expected implementation of " + DataSourceFactory.class.getName() +
- ", but received: " + dbFactory);
- }
- }
-
- @Override
- public void onApplicationStart() {
- if (changed()) {
- String dbName = "";
- try {
- // Destroy all connections
- if (!DB.datasources.isEmpty()) {
- DB.destroyAll();
- }
-
- // Define common parameter here
- if (play.Logger.usesJuli()) {
- System.setProperty("com.mchange.v2.log.MLog", "jul");
- } else {
- System.setProperty("com.mchange.v2.log.MLog", "log4j");
- }
-
- Set dbNames = Configuration.getDbNames();
- for (String name : dbNames) {
- dbName = name;
- Configuration dbConfig = new Configuration(dbName);
-
- boolean isJndiDatasource = false;
- String datasourceName = dbConfig.getProperty("db", "");
-
- // Identify datasource JNDI lookup name by 'jndi:' or 'java:' prefix
- if (datasourceName.startsWith("jndi:")) {
- datasourceName = datasourceName.substring("jndi:".length());
- isJndiDatasource = true;
- }
-
- if (isJndiDatasource || datasourceName.startsWith("java:")) {
- Context ctx = new InitialContext();
- DataSource ds = (DataSource) ctx.lookup(datasourceName);
- DB.datasource = ds;
- DB.destroyMethod = "";
- DB.ExtendedDatasource extDs = new DB.ExtendedDatasource(ds, "");
- DB.datasources.put(dbName, extDs);
- } else {
-
- // Try the driver
- String driver = dbConfig.getProperty("db.driver");
- try {
- Driver d = (Driver) Class.forName(driver, true, Play.classloader).newInstance();
- DriverManager.registerDriver(new ProxyDriver(d));
- } catch (Exception e) {
- throw new Exception("Database [" + dbName + "] Driver not found (" + driver + ")", e);
- }
-
- // Try the connection
- Connection fake = null;
- try {
- if (dbConfig.getProperty("db.user") == null) {
- fake = DriverManager.getConnection(dbConfig.getProperty("db.url"));
- } else {
- fake = DriverManager.getConnection(dbConfig.getProperty("db.url"), dbConfig.getProperty("db.user"), dbConfig.getProperty("db.pass"));
- }
- } finally {
- if (fake != null) {
- fake.close();
- }
- }
-
- DataSource ds = factory(dbConfig).createDataSource(dbConfig);
-
- // Current datasource. This is actually deprecated.
- String destroyMethod = dbConfig.getProperty("db.destroyMethod", "");
- DB.datasource = ds;
- DB.destroyMethod = destroyMethod;
-
- DB.ExtendedDatasource extDs = new DB.ExtendedDatasource(ds, destroyMethod);
-
- url = testDataSource(ds);
- Logger.info("Connected to %s for %s", url, dbName);
- DB.datasources.put(dbName, extDs);
- }
- }
-
- } catch (Exception e) {
- DB.datasource = null;
- Logger.error(e, "Database [%s] Cannot connected to the database : %s", dbName, e.getMessage());
- if (e.getCause() instanceof InterruptedException) {
- throw new DatabaseException("Cannot connected to the database["+ dbName + "]. Check the configuration.", e);
- }
- throw new DatabaseException("Cannot connected to the database["+ dbName + "], " + e.getMessage(), e);
- }
- }
- }
-
- protected String testDataSource(DataSource ds) throws SQLException {
- try (Connection connection = ds.getConnection()) {
- return connection.getMetaData().getURL();
- }
- }
-
- @Override
- public void onApplicationStop() {
- if (Play.mode.isProd()) {
- DB.destroyAll();
- }
- }
-
- @Override
- public void invocationFinally() {
- DB.closeAll();
- }
-
- private static void check(Configuration config, String mode, String property) {
- if (!StringUtils.isEmpty(config.getProperty(property))) {
- Logger.warn("Ignoring " + property + " because running the in " + mode + " db.");
- }
- }
-
- private boolean changed() {
- Set dbNames = Configuration.getDbNames();
-
- for (String dbName : dbNames) {
- Configuration dbConfig = new Configuration(dbName);
-
- if ("mem".equals(dbConfig.getProperty("db")) && dbConfig.getProperty("db.url") == null) {
- dbConfig.put("db.driver", "org.h2.Driver");
- dbConfig.put("db.url", "jdbc:h2:mem:play;MODE=MYSQL");
- dbConfig.put("db.user", "sa");
- dbConfig.put("db.pass", "");
- }
-
- if ("fs".equals(dbConfig.getProperty("db")) && dbConfig.getProperty("db.url") == null) {
- dbConfig.put("db.driver", "org.h2.Driver");
- dbConfig.put("db.url", "jdbc:h2:" + (new File(Play.applicationPath, "db/h2/play").getAbsolutePath()) + ";MODE=MYSQL");
- dbConfig.put("db.user", "sa");
- dbConfig.put("db.pass", "");
- }
- String datasourceName = dbConfig.getProperty("db", "");
- DataSource ds = DB.getDataSource(dbName);
-
- if ((datasourceName.startsWith("java:") || datasourceName.startsWith("jndi:")) && dbConfig.getProperty("db.url") == null) {
- if (ds == null) {
- return true;
- }
- } else {
- // Internal pool is c3p0, we should call the close() method to destroy it.
- check(dbConfig, "internal pool", "db.destroyMethod");
-
- dbConfig.put("db.destroyMethod", "close");
- }
-
- Matcher m = new jregex.Pattern("^mysql:(//)?(({user}[a-zA-Z0-9_]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[a-zA-Z0-9_]+)(\\?)?({parameters}[^\\s]+)?$").matcher(dbConfig.getProperty("db", ""));
- if (m.matches()) {
- String user = m.group("user");
- String password = m.group("pwd");
- String name = m.group("name");
- String host = m.group("host");
- String parameters = m.group("parameters");
-
- dbConfig.put("db.driver", "com.mysql.jdbc.Driver");
- dbConfig.put("db.url", "jdbc:mysql://" + (host == null ? "localhost" : host) + "/" + name + "?" + parameters);
- if (user != null) {
- dbConfig.put("db.user", user);
- }
- if (password != null) {
- dbConfig.put("db.pass", password);
- }
- }
-
- m = new jregex.Pattern("^postgres:(//)?(({user}[a-zA-Z0-9_]+)(:({pwd}[^@]+))?@)?(({host}[^/]+)/)?({name}[^\\s]+)$").matcher(dbConfig.getProperty("db", ""));
- if (m.matches()) {
- String user = m.group("user");
- String password = m.group("pwd");
- String name = m.group("name");
- String host = m.group("host");
- dbConfig.put("db.driver", "org.postgresql.Driver");
- dbConfig.put("db.url", "jdbc:postgresql://" + (host == null ? "localhost" : host) + "/" + name);
- if (user != null) {
- dbConfig.put("db.user", user);
- }
- if (password != null) {
- dbConfig.put("db.pass", password);
- }
- }
-
- if(dbConfig.getProperty("db.url") != null && dbConfig.getProperty("db.url").startsWith("jdbc:h2:mem:")) {
- dbConfig.put("db.driver", "org.h2.Driver");
- dbConfig.put("db.user", "sa");
- dbConfig.put("db.pass", "");
- }
-
- if ((dbConfig.getProperty("db.driver") == null) || (dbConfig.getProperty("db.url") == null)) {
- return false;
- }
-
- if (ds == null) {
- return true;
- } else {
- DataSourceFactory factory = factory(dbConfig);
-
- if (!dbConfig.getProperty("db.driver").equals(factory.getDriverClass(ds))) {
- return true;
- }
- if (!dbConfig.getProperty("db.url").equals(factory.getJdbcUrl(ds))) {
- return true;
- }
- if (!dbConfig.getProperty("db.user", "").equals(factory.getUser(ds))) {
- return true;
- }
- }
-
- ExtendedDatasource extDataSource = DB.datasources.get(dbName);
-
- if (extDataSource != null && !dbConfig.getProperty("db.destroyMethod", "").equals(extDataSource.getDestroyMethod())) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Needed because DriverManager will not load a driver ouside of the system classloader
- */
- public static class ProxyDriver implements Driver {
-
- private final Driver driver;
-
- ProxyDriver(Driver d) {
- this.driver = d;
- }
-
- @Override
- public boolean acceptsURL(String u) throws SQLException {
- return this.driver.acceptsURL(u);
- }
-
- @Override
- public Connection connect(String u, Properties p) throws SQLException {
- return this.driver.connect(u, p);
- }
-
- @Override
- public int getMajorVersion() {
- return this.driver.getMajorVersion();
- }
-
- @Override
- public int getMinorVersion() {
- return this.driver.getMinorVersion();
- }
-
- @Override
- public DriverPropertyInfo[] getPropertyInfo(String u, Properties p) throws SQLException {
- return this.driver.getPropertyInfo(u, p);
- }
-
- @Override
- public boolean jdbcCompliant() {
- return this.driver.jdbcCompliant();
- }
-
- @Override
- public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return this.driver.getParentLogger();
- }
- }
-}
diff --git a/framework/src/play/db/DataSourceFactory.java b/framework/src/play/db/DataSourceFactory.java
deleted file mode 100644
index df79c1f1da..0000000000
--- a/framework/src/play/db/DataSourceFactory.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package play.db;
-
-import javax.sql.DataSource;
-import java.beans.PropertyVetoException;
-import java.sql.SQLException;
-
-public interface DataSourceFactory {
- DataSource createDataSource(Configuration dbConfig) throws PropertyVetoException, SQLException;
-
- String getStatus() throws SQLException;
-
- String getDriverClass(DataSource ds);
- String getJdbcUrl(DataSource ds);
- String getUser(DataSource ds);
-}
diff --git a/framework/src/play/db/Evolutions.java b/framework/src/play/db/Evolutions.java
deleted file mode 100644
index 043f78d8ce..0000000000
--- a/framework/src/play/db/Evolutions.java
+++ /dev/null
@@ -1,695 +0,0 @@
-package play.db;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.Stack;
-
-import org.apache.commons.lang3.StringUtils;
-
-import play.Logger;
-import play.Play;
-import play.PlayPlugin;
-import play.classloading.ApplicationClasses;
-import play.classloading.ApplicationClassloader;
-import play.db.evolutions.Evolution;
-import play.db.evolutions.EvolutionQuery;
-import play.db.evolutions.EvolutionState;
-import play.db.evolutions.exceptions.InconsistentDatabase;
-import play.db.evolutions.exceptions.InvalidDatabaseRevision;
-import play.exceptions.UnexpectedException;
-import play.libs.IO;
-import play.mvc.Http.Request;
-import play.mvc.Http.Response;
-import play.mvc.results.Redirect;
-import play.vfs.VirtualFile;
-
-/**
- * Handles migration of data.
- *
- * Does only support the default DBConfig
- */
-public class Evolutions extends PlayPlugin {
-
- private static final String EVOLUTIONS_TABLE_NAME = "play_evolutions";
- private static final Map modulesWithEvolutions = new LinkedHashMap<>();
-
- protected static final File evolutionsDirectory = Play.getFile("db/evolutions");
-
-
- public static void main(String[] args) throws SQLException {
- /** Start the DB plugin **/
- Play.guessFrameworkPath();
- Play.readConfiguration();
- Play.classes = new ApplicationClasses();
- Play.classloader = new ApplicationClassloader();
-
- Play.loadModules(VirtualFile.open(Play.applicationPath));
-
- if (System.getProperty("modules") != null) {
- populateModulesWithSpecificModules();
- } else {
- populateModulesWithEvolutions();
- }
-
- if (modulesWithEvolutions.isEmpty()) {
- System.out.println("~ Nothing has evolutions, go away and think again.");
- System.exit(-1);
- return;
- }
-
- Logger.init();
- Logger.setUp("ERROR");
- new DBPlugin().onApplicationStart();
-
- // Look over all the DB
- Set dBNames = Configuration.getDbNames();
- boolean defaultExitCode = true;
-
- for (String dbName : dBNames) {
- Configuration dbConfig = new Configuration(dbName);
- /** Connected **/
- System.out.println("~ Connected to " + DB.getDataSource(dbName).getConnection().getMetaData().getURL());
-
- for (Entry moduleRoot : modulesWithEvolutions.entrySet()) {
- if (!isDatabaseEvolutionDisabled(dbName)) {
- /** Summary **/
- Evolution database = listDatabaseEvolutions(dbName, moduleRoot.getKey()).peek();
- Evolution application = listApplicationEvolutions(dbName, moduleRoot.getKey(), moduleRoot.getValue()).peek();
-
- boolean needToCheck = true;
- if ("resolve".equals(System.getProperty("mode"))) {
- needToCheck = handleResolveAction(dbName, moduleRoot);
- }
- if (needToCheck) {
- /** Check inconsistency **/
- try {
- checkEvolutionsState(dbName);
- } catch (InconsistentDatabase e) {
- defaultExitCode = false;
- System.out.println("~");
- System.out.println("~ Your database " + dbName + " is in an inconsistent state!");
- System.out.println("~");
- System.out.println("~ While applying this script part:");
- System.out.println("");
- System.out.println(e.getEvolutionScript());
- System.out.println("");
- System.out.println("~ The following error occurred:");
- System.out.println("");
- System.out.println(e.getError());
- System.out.println("");
- System.out.println("~ Please correct it manually, and mark it resolved by running `play evolutions:resolve`");
- System.out.println("~");
- continue;
- } catch (InvalidDatabaseRevision e) {
- // see later
- }
-
- System.out.print("~ '" + moduleRoot.getKey() + "' Application revision is " + application.revision + " ["
- + application.hash.substring(0, 7) + "]");
- System.out.println(" and '" + moduleRoot.getKey() + "' Database revision is " + database.revision + " ["
- + database.hash.substring(0, 7) + "]");
- System.out.println("~");
-
- /** Evolution script **/
- List evolutions = getEvolutionScript(dbName, moduleRoot.getKey(), moduleRoot.getValue());
- if (evolutions.isEmpty()) {
- System.out.println("~ Your database " + dbName + " is up to date for " + moduleRoot.getKey());
- System.out.println("~");
- } else {
- if ("apply".equals(System.getProperty("mode"))) {
- if (!handleApplyAction(dbName, moduleRoot, evolutions)) {
- defaultExitCode = false;
- }
- } else if ("markApplied".equals(System.getProperty("mode"))) {
- if (!handleMarkAppliedAction(dbName, moduleRoot, evolutions)) {
- defaultExitCode = false;
- }
- } else {
- defaultExitCode = false;
- handleDefaultAction(dbName, moduleRoot, evolutions);
- }
- }
- }
- } else {
- System.out.println("~ Database evolutions are disabled for " + dbName + ". Skipping check.");
- }
- }
- }
-
- if (!defaultExitCode) {
- System.exit(-1);
- }
- }
-
- /**
- * Method to handle the "default" action
- *
- * @param dbName
- * database name
- * @param moduleRoot
- * the module root of evolutions
- * @param evolutions
- * list of evolutions
- */
- private static void handleDefaultAction(String dbName, Entry moduleRoot, List evolutions) {
- System.out.println("~ Your database " + dbName + " needs evolutions for " + moduleRoot.getKey() + "!");
- System.out.println("");
- System.out.println("# ------------------------------------------------------------------------------");
- System.out.println("");
- System.out.println(toHumanReadableScript(evolutions));
- System.out.println("");
- System.out.println("# ------------------------------------------------------------------------------");
- System.out.println("");
- System.out.println("~ Run `play evolutions:apply` to automatically apply this script to the database");
- System.out.println("~ or apply it yourself and mark it done using `play evolutions:markApplied`");
- System.out.println("~");
- }
-
- /**
- * Method to handle the "resolve" action
- *
- * @param dbName
- * database name
- * @param moduleRoot
- * the module root of evolutions
- * @return true if need to check, false otherwise
- */
- private static boolean handleResolveAction(String dbName, Entry moduleRoot) {
- try {
- checkEvolutionsState(dbName);
- System.out.println("~");
- System.out.println("~ Nothing to resolve for " + moduleRoot.getKey() + "...");
- System.out.println("~");
- return false;
- } catch (InconsistentDatabase e) {
- resolve(dbName, moduleRoot.getKey(), e.getRevision());
- System.out.println("~");
- System.out.println("~ Revision " + e.getRevision() + " for " + moduleRoot.getKey() + " has been resolved;");
- System.out.println("~");
- } catch (InvalidDatabaseRevision e) {
- // see later
- }
- return true;
- }
-
- /**
- * Method to handle the "apply" action
- *
- * @param dbName
- * database name
- * @param moduleRoot
- * the module root of evolutions
- * @param evolutions
- * list of evolutions
- * @return true if action was applied successfully, false otherwise
- */
- private static boolean handleApplyAction(String dbName, Entry moduleRoot, List evolutions) {
- System.out.println("~ Applying evolutions for " + moduleRoot.getKey() + ":");
- System.out.println("");
- System.out.println("# ------------------------------------------------------------------------------");
- System.out.println("");
- System.out.println(toHumanReadableScript(evolutions));
- System.out.println("");
- System.out.println("# ------------------------------------------------------------------------------");
- System.out.println("");
- if (applyScript(dbName, true, moduleRoot.getKey(), moduleRoot.getValue())) {
- System.out.println("~");
- System.out.println("~ Evolutions script successfully applied for " + moduleRoot.getKey() + "!");
- System.out.println("~");
- return true;
- } else {
- System.out.println("~");
- System.out.println("~ Can't apply evolutions for " + moduleRoot.getKey() + "...");
- System.out.println("~");
- return false;
- }
- }
-
- /**
- * Method to handle the "markApplied" action
- *
- * @param dbName
- * database name
- * @param moduleRoot
- * the module root of evolutions
- * @param evolutions
- * list of evolutions
- * @return true if action was applied successfully, false otherwise
- */
- private static boolean handleMarkAppliedAction(String dbName, Entry moduleRoot, List evolutions) {
- if (applyScript(dbName, false, moduleRoot.getKey(), moduleRoot.getValue())) {
- System.out.println("~ Evolutions script marked as applied for " + moduleRoot.getKey() + "!");
- System.out.println("~");
- return true;
- } else {
- System.out.println("~ Can't apply evolutions for " + moduleRoot.getKey() + "...");
- System.out.println("~");
- return false;
- }
- }
-
- private static void populateModulesWithSpecificModules() {
- String[] specificModules = System.getProperty("modules").split(",");
-
- System.out.println("~ You've requested running evolutions only for these modules: ");
- for (String specificModule : specificModules) {
- System.out.println("~~ '" + specificModule + "'");
- }
- System.out.println("~");
-
- boolean weShouldAddTheMainProject = false;
-
- for (String specificModule : specificModules) {
- if (Play.modules.containsKey(specificModule)) {
- VirtualFile moduleRoot = Play.modules.get(specificModule);
-
- if (!isModuleEvolutionDisabled(specificModule) && moduleRoot.child("db/evolutions").exists()) {
- modulesWithEvolutions.put(specificModule, moduleRoot.child("db/evolutions"));
- } else {
- System.out.println(
- "~ '" + specificModule + "' module doesn't have any evolutions scripts in it or evolutions are disabled.");
- System.out.println("~");
- System.exit(-1);
- }
- } else if (Play.configuration.getProperty("application.name").equals(specificModule)) {
- weShouldAddTheMainProject = true;
- } else {
- System.out.println("~ Couldn't find a module with the name '" + specificModule + "'. ");
- System.exit(-1);
- }
- }
-
- if (weShouldAddTheMainProject) {
- addMainProjectToModuleList();
- }
- }
-
- private static void populateModulesWithEvolutions() {
- /** Check that evolutions are enabled **/
- if (!isModuleEvolutionDisabled()) {
- for (Entry moduleRoot : Play.modules.entrySet()) {
- if (moduleRoot.getValue().child("db/evolutions").exists()) {
- if (!isModuleEvolutionDisabled(moduleRoot.getKey())) {
- modulesWithEvolutions.put(moduleRoot.getKey(), moduleRoot.getValue().child("db/evolutions"));
- } else {
- System.out.println("~ '" + moduleRoot.getKey() + "' module evolutions are disabled.");
- }
- }
- }
- } else {
- System.out.println("~ Module evolutions are disabled.");
- }
-
- addMainProjectToModuleList();
- }
-
- private static void addMainProjectToModuleList() {
- if (evolutionsDirectory.exists()) {
- modulesWithEvolutions.put(Play.configuration.getProperty("application.name"), VirtualFile.open(evolutionsDirectory));
- }
- }
-
- @Override
- public boolean rawInvocation(Request request, Response response) throws Exception {
-
- // Mark an evolution as resolved
- if (Play.mode.isDev() && request.method.equals("POST") && request.url.matches("^/@evolutions/force/[a-zA-Z0-9]+/[0-9]+$")) {
- int index = request.url.lastIndexOf("/@evolutions/force/") + "/@evolutions/force/".length();
-
- String dbName = DB.DEFAULT;
- String moduleKey = request.url.substring(index, request.url.lastIndexOf('/'));
- int revision = Integer.parseInt(request.url.substring(request.url.lastIndexOf('/') + 1));
-
- resolve(dbName, moduleKey, revision);
- new Redirect("/").apply(request, response);
- return true;
- }
-
- // Apply the current evolution script
- if (Play.mode.isDev() && request.method.equals("POST") && request.url.equals("/@evolutions/apply")) {
-
- for (Entry moduleRoot : modulesWithEvolutions.entrySet()) {
- applyScript(true, moduleRoot.getKey(), moduleRoot.getValue());
- }
- new Redirect("/").apply(request, response);
- return true;
- }
- return super.rawInvocation(request, response);
- }
-
- @Override
- public void beforeInvocation() {
- if (isDisabled() || Play.mode.isProd()) {
- return;
- }
- try {
- checkEvolutionsState();
- } catch (InvalidDatabaseRevision e) {
- Set dbNames = Configuration.getDbNames();
- for (String dbName : dbNames) {
- Configuration dbConfig = new Configuration(dbName);
-
- for (Entry moduleRoot : modulesWithEvolutions.entrySet()) {
- if ("mem".equals(dbConfig.getProperty("db"))
- && listDatabaseEvolutions(e.getDbName(), moduleRoot.getKey()).peek().revision == 0) {
- Logger.info("Automatically applying evolutions in in-memory database");
- Logger.info("Applying evolutions for '" + moduleRoot.getKey() + "'");
- applyScript(true, moduleRoot.getKey(), moduleRoot.getValue());
- } else {
- throw e;
- }
- }
- }
- }
- }
-
- @Override
- public void onApplicationStart() {
- if (!isDisabled()) {
- populateModulesWithEvolutions();
- if (Play.mode.isProd()) {
- try {
- checkEvolutionsState();
- } catch (InvalidDatabaseRevision e) {
- Logger.warn("");
- Logger.warn("Your database is not up to date.");
- Logger.warn("Use `play evolutions` command to manage database evolutions.");
- throw e;
- }
- }
- }
- }
-
- /**
- * Checks if evolutions is disabled in application.conf (property "evolutions.enabled")
- */
- private boolean isDisabled() {
- return "false".equals(Play.configuration.getProperty("evolutions.enabled", "true"));
- }
-
- private static boolean isDatabaseEvolutionDisabled(String dbName) {
- return "false".equals(Play.configuration.getProperty("db." + dbName + ".evolutions.enabled", "true"));
- }
-
- private static boolean isModuleEvolutionDisabled() {
- return "false".equals(Play.configuration.getProperty("modules.evolutions.enabled", "true"));
- }
-
- private static boolean isModuleEvolutionDisabled(String name) {
- return "false".equals(Play.configuration.getProperty(name + ".evolutions.enabled", "true"));
- }
-
- public static boolean autoCommit() {
- return !"false".equals(Play.configuration.getProperty("evolutions.autocommit", "true"));
- }
-
- public static synchronized void resolve(int revision) {
- try {
- EvolutionQuery.resolve(DB.DEFAULT, revision, Play.configuration.getProperty("application.name"));
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static synchronized void resolve(String dBName, int revision) {
- try {
- EvolutionQuery.resolve(dBName, revision, Play.configuration.getProperty("application.name"));
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static synchronized void resolve(String dBName, String moduleKey, int revision) {
- try {
- EvolutionQuery.resolve(dBName, revision, moduleKey);
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static synchronized boolean applyScript(boolean runScript, String moduleKey, VirtualFile evolutionsDirectory) {
- // Look over all the DB
- Set dBNames = Configuration.getDbNames();
- for (String dbName : dBNames) {
- return applyScript(dbName, runScript, moduleKey, evolutionsDirectory);
- }
- return true;
- }
-
- public static synchronized boolean applyScript(String dbName, boolean runScript, String moduleKey, VirtualFile evolutionsDirectory) {
- try {
- Connection connection = EvolutionQuery.getNewConnection(dbName, Evolutions.autoCommit());
- int applying = -1;
- try {
- List evolutions = getEvolutionScript(dbName, moduleKey, evolutionsDirectory);
- for (Evolution evolution : evolutions) {
- applying = evolution.revision;
- EvolutionQuery.apply(connection, runScript, evolution, moduleKey);
- }
-
- if (!Evolutions.autoCommit()) {
- connection.commit();
- }
-
- return true;
- } catch (Exception e) {
- Logger.error(e, "Can't apply evolution");
- if (Evolutions.autoCommit()) {
- String message = e.getMessage();
- if (e instanceof SQLException) {
- SQLException ex = (SQLException) e;
- message += " [ERROR:" + ex.getErrorCode() + ", SQLSTATE:" + ex.getSQLState() + "]";
- }
-
- EvolutionQuery.setProblem(connection, applying, moduleKey, message);
- } else {
- connection.rollback();
- }
- return false;
- } finally {
- EvolutionQuery.closeConnection(connection);
- }
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static String toHumanReadableScript(List evolutionScript) {
- // Construct the script
- StringBuilder sql = new StringBuilder();
- boolean containsDown = false;
- for (Evolution evolution : evolutionScript) {
- if (!evolution.applyUp) {
- containsDown = true;
- }
- sql.append("# --- Rev:").append(evolution.revision).append(",").append(evolution.applyUp ? "Ups" : "Downs").append(" - ")
- .append(evolution.hash.substring(0, 7)).append("\n");
- sql.append("\n");
- sql.append(evolution.applyUp ? evolution.sql_up : evolution.sql_down);
- sql.append("\n\n");
- }
-
- if (containsDown) {
- sql.insert(0, "# !!! WARNING! This script contains DOWNS evolutions that are likely destructive\n\n");
- }
-
- return sql.toString().trim();
- }
-
- public static synchronized void checkEvolutionsState() {
- // Look over all the DB
- Set dBNames = Configuration.getDbNames();
- for (String dbName : dBNames) {
- if (!isDatabaseEvolutionDisabled(dbName)) {
- checkEvolutionsState(dbName);
- }
- }
- }
-
- public static synchronized void checkEvolutionsState(String dbName) {
- for (Entry moduleRoot : modulesWithEvolutions.entrySet()) {
-
- if (DB.getDataSource(dbName) != null) {
- List evolutionScript = getEvolutionScript(dbName, moduleRoot.getKey(), moduleRoot.getValue());
- Connection connection = null;
- ResultSet resultSet = null;
- try {
- connection = EvolutionQuery.getNewConnection(dbName);
- resultSet = EvolutionQuery.getEvolutionsToApply(connection, moduleRoot.getKey());
- if (resultSet.next()) {
- int revision = resultSet.getInt("id");
- String state = resultSet.getString("state");
- String hash = resultSet.getString("hash").substring(0, 7);
- String script = "";
- if (EvolutionState.APPLYING_UP.getStateWord().equals(state)) {
- script = resultSet.getString("apply_script");
- } else {
- script = resultSet.getString("revert_script");
- }
- script = "# --- Rev:" + revision + "," + (EvolutionState.APPLYING_UP.getStateWord().equals(state) ? "Ups" : "Downs")
- + " - " + hash + "\n\n" + script;
- String error = resultSet.getString("last_problem");
- throw new InconsistentDatabase(dbName, script, error, revision, moduleRoot.getKey());
- }
- } catch (SQLException e) {
- throw new UnexpectedException(e);
- } finally {
- EvolutionQuery.closeResultSet(resultSet);
- EvolutionQuery.closeConnection(connection);
- }
-
- if (!evolutionScript.isEmpty()) {
- throw new InvalidDatabaseRevision(dbName, toHumanReadableScript(evolutionScript));
- }
- }
- }
- }
-
- public static synchronized List getEvolutionScript(String dbName, String moduleKey, VirtualFile evolutionsDirectory) {
- Stack app = listApplicationEvolutions(dbName, moduleKey, evolutionsDirectory);
- Stack db = listDatabaseEvolutions(dbName, moduleKey);
- List downs = new ArrayList<>();
- List ups = new ArrayList<>();
-
- // Apply non conflicting evolutions (ups and downs)
- while (db.peek().revision != app.peek().revision) {
- if (db.peek().revision > app.peek().revision) {
- downs.add(db.pop());
- } else {
- ups.add(app.pop());
- }
- }
-
- // Revert conflicting to fork node
- while (db.peek().revision == app.peek().revision && !(db.peek().hash.equals(app.peek().hash))) {
- downs.add(db.pop());
- ups.add(app.pop());
- }
-
- // Ups need to be applied earlier first
- Collections.reverse(ups);
-
- List script = new ArrayList<>();
- script.addAll(downs);
- script.addAll(ups);
-
- return script;
- }
-
- public static synchronized Stack listApplicationEvolutions(String dBName, String moduleKey,
- VirtualFile evolutionsDirectory) {
- Stack evolutions = new Stack<>();
- evolutions.add(new Evolution("", 0, "", "", true));
- if (evolutionsDirectory.exists()) {
- for (File evolution : evolutionsDirectory.getRealFile().listFiles()) {
- if (evolution.getName().matches("^" + dBName + ".[0-9]+[.]sql$")
- || (DB.DEFAULT.equals(dBName) && evolution.getName().matches("^[0-9]+[.]sql$"))) {
- if (Logger.isTraceEnabled()) {
- Logger.trace("Loading evolution %s", evolution);
- }
-
- int version = 0;
- if (evolution.getName().contains(dBName)) {
- version = Integer.parseInt(
- evolution.getName().substring(evolution.getName().indexOf('.') + 1, evolution.getName().lastIndexOf('.')));
- } else {
- version = Integer.parseInt(evolution.getName().substring(0, evolution.getName().indexOf('.')));
- }
-
- String sql = IO.readContentAsString(evolution);
- StringBuilder sql_up = new StringBuilder();
- StringBuilder sql_down = new StringBuilder();
- StringBuilder current = new StringBuilder();
- for (String line : sql.split("\r?\n")) {
- if (line.trim().matches("^#.*[!]Ups")) {
- current = sql_up;
- } else if (line.trim().matches("^#.*[!]Downs")) {
- current = sql_down;
- } else if (line.trim().startsWith("#")) {
- // skip
- } else if (!StringUtils.isEmpty(line.trim())) {
- current.append(line).append("\n");
- }
- }
- evolutions.add(new Evolution(moduleKey, version, sql_up.toString(), sql_down.toString(), true));
- }
- }
- Collections.sort(evolutions);
- }
- return evolutions;
- }
-
- private static boolean isEvolutionsTableExist(Connection connection) {
- String tableName = EVOLUTIONS_TABLE_NAME;
- ResultSet resultSet = null;
- try {
- resultSet = connection.getMetaData().getTables(null, null, tableName, null);
- if (!resultSet.next()) {
- // Table in lowercase does not exist
- // oracle gives table names in upper case
- tableName = tableName.toUpperCase();
- Logger.trace("Checking " + tableName);
- resultSet.close();
- resultSet = connection.getMetaData().getTables(null, null, tableName, null);
- // Does it exist?
- if (!resultSet.next()) {
- // did not find it in uppercase either
- return false;
- }
- }
- } catch (SQLException e) {
- Logger.error(e, "SQL error while checking if play evolutions exist");
- } finally {
- EvolutionQuery.closeResultSet(resultSet);
- }
- return true;
- }
-
- public static synchronized Stack listDatabaseEvolutions(String dbName, String moduleKey) {
- Stack evolutions = new Stack<>();
- evolutions.add(new Evolution("", 0, "", "", false));
- Connection connection = null;
- try {
- connection = EvolutionQuery.getNewConnection(dbName);
- // Do we have a
- if (isEvolutionsTableExist(connection)) {
- checkAndUpdateEvolutionsForMultiModuleSupport(dbName, connection);
-
- ResultSet databaseEvolutions = EvolutionQuery.getEvolutions(connection, moduleKey);
-
- while (databaseEvolutions.next()) {
- Evolution evolution = new Evolution(moduleKey, databaseEvolutions.getInt(1), databaseEvolutions.getString(3),
- databaseEvolutions.getString(4), false);
- evolutions.add(evolution);
- }
-
- } else {
- EvolutionQuery.createTable(dbName);
- }
- } catch (SQLException e) {
- Logger.error(e, "SQL error while checking play evolutions");
- } finally {
- EvolutionQuery.closeConnection(connection);
- }
- Collections.sort(evolutions);
- return evolutions;
- }
-
- private static void checkAndUpdateEvolutionsForMultiModuleSupport(String dbName, Connection connection) throws SQLException {
- ResultSet rs = connection.getMetaData().getColumns(null, null, "play_evolutions", "module_key");
- if (!rs.next()) {
- System.out.println("!!! - Updating the play_evolutions table to cope with multiple modules - !!!");
- EvolutionQuery.alterForModuleSupport(dbName, connection);
- }
- }
-
-}
diff --git a/framework/src/play/db/Model.java b/framework/src/play/db/Model.java
index 26320ae5f6..b83b74e39e 100644
--- a/framework/src/play/db/Model.java
+++ b/framework/src/play/db/Model.java
@@ -44,21 +44,7 @@ public static interface Factory {
public List listProperties();
}
-
- public static class Manager {
-
- public static Model.Factory factoryFor(Class clazz) {
- if(Model.class.isAssignableFrom(clazz)) {
- Model.Factory factory = Play.pluginCollection.modelFactory(clazz);
- if( factory != null) {
- return factory;
- }
- }
- throw new UnexpectedException("Model " + clazz.getName() + " is not managed by any plugin");
- }
-
- }
-
+
public static interface BinaryField {
public InputStream get();
diff --git a/framework/src/play/db/SQLSplitter.java b/framework/src/play/db/SQLSplitter.java
deleted file mode 100644
index dd1117a71f..0000000000
--- a/framework/src/play/db/SQLSplitter.java
+++ /dev/null
@@ -1,238 +0,0 @@
-package play.db;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-public class SQLSplitter implements Iterable {
-
- /**
- * Skips the index past the quote.
- *
- * @param s
- * The string
- * @param start
- * The starting character of the quote.
- * @return The index that skips past the quote starting at start. If the quote does not start at that point, it
- * simply returns start.
- */
- static int consumeQuote(CharSequence s, int start) {
- if (start >= s.length())
- return start;
- char ender;
- switch (s.charAt(start)) {
- case '\'':
- ender = '\'';
- break;
- case '"':
- ender = '"';
- break;
- case '[':
- ender = ']';
- break;
-
- case '`':
- ender = '`';
- break;
- case '$': {
- int quoteEnd = start + 1;
- for (; s.charAt(quoteEnd) != '$'; ++quoteEnd)
- if (quoteEnd >= s.length())
- return quoteEnd;
- int i = quoteEnd + 1;
- while (i < s.length()) {
- if (s.charAt(i) == '$') {
- boolean match = true;
- for (int j = start; j <= quoteEnd && i < s.length(); ++j, ++i) {
- if (s.charAt(i) != s.charAt(j)) {
- match = false;
- break;
- }
- }
- if (match)
- return i;
- } else
- ++i;
- }
- return i;
- }
-
- default:
- return start;
- }
-
- boolean escaped = false;
-
- for (int i = start + 1; i < s.length(); ++i) {
- if (escaped) {
- escaped = false;
- continue;
- }
- char c = s.charAt(i);
- if (c == '\\')
- escaped = true;
- else if (c == ender)
- return i + 1;
- }
- return s.length();
- }
-
- static boolean isNewLine(char c) {
- return c == '\n' || c == '\r';
- }
-
- /**
- * Returns the index of the next line from a start location.
- */
- static int consumeTillNextLine(CharSequence s, int start) {
- while (start < s.length() && !isNewLine(s.charAt(start)))
- ++start;
- while (start < s.length() && isNewLine(s.charAt(start)))
- ++start;
- return start;
- }
-
- static boolean isNext(CharSequence s, int start, char c) {
- if (start + 1 < s.length())
- return s.charAt(start + 1) == c;
- return false;
- }
-
- /**
- * Skips the index past the comment.
- *
- * @param s
- * The string
- * @param start
- * The starting character of the comment
- * @return The index that skips past the comment starting at start. If the comment does not start at that point, it
- * simply returns start.
- */
- static int consumeComment(CharSequence s, int start) {
- if (start >= s.length())
- return start;
- switch (s.charAt(start)) {
- case '-':
- if (isNext(s, start, '-'))
- return consumeTillNextLine(s, start + 2);
- else
- return start;
-
- case '#':
- return consumeTillNextLine(s, start);
-
- case '/':
- if (isNext(s, start, '*')) {
- start += 2;
- while (start < s.length()) {
- if (s.charAt(start) == '*') {
- ++start;
- if (start < s.length() && s.charAt(start) == '/')
- return start + 1;
- } else
- ++start;
- }
- }
- return start;
-
- case '{':
- while (start < s.length() && s.charAt(start) != '}')
- ++start;
- return start + 1;
-
- default:
- return start;
- }
- }
-
- static int consumeParentheses(CharSequence s, int start) {
- if (start >= s.length())
- return start;
- switch (s.charAt(start)) {
- case '(':
- ++start;
- while (start < s.length()) {
- if (s.charAt(start) == ')')
- return start + 1;
- start = nextChar(s, start);
- }
- break;
- default:
- break;
- }
- return start;
- }
-
- static int nextChar(CharSequence sql, int start) {
- int i = consumeParentheses(sql, consumeComment(sql, consumeQuote(sql, start)));
- if (i == start)
- return Math.min(start + 1, sql.length());
- do {
- int j = consumeParentheses(sql, consumeComment(sql, consumeQuote(sql, i)));
- if (j == i)
- return i;
- i = j;
- } while (true);
- }
-
- /**
- * Splits the SQL "properly" based on semicolons. Respecting quotes and comments.
- *
- * @param sql
- * the SQL statement
- * @return List of all SQL statements
- */
- public static ArrayList splitSQL(CharSequence sql) {
- ArrayList ret = new ArrayList<>();
- for (CharSequence c : new SQLSplitter(sql))
- ret.add(c);
- return ret;
- }
-
- final CharSequence sql;
-
- public SQLSplitter(CharSequence sql) {
- this.sql = sql;
- }
-
- @Override
- public Iterator iterator() {
- return new Iterator() {
- int i = 0, prev = 0;
-
- @Override
- public boolean hasNext() {
- return prev < sql.length();
- }
-
- @Override
- public CharSequence next() {
- while (i < sql.length()) {
- if (sql.charAt(i) == ';') {
- ++i;
- // check "double semicolon" -> used to escape a semicolon and avoid splitting
- if ((i < sql.length() && sql.charAt(i) == ';')) {
- ++i;
- } else {
- CharSequence ret = sql.subSequence(prev, i).toString().replace(";;", ";");
- prev = i;
- return ret;
- }
- }
- i = nextChar(sql, i);
- }
- if (prev != i) {
- CharSequence ret = sql.subSequence(prev, i).toString().replace(";;", ";");
- prev = i;
- return ret;
- }
- throw new NoSuchElementException();
- }
-
- @Override
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
- }
-}
diff --git a/framework/src/play/db/c3p0/C3P0DataSourceFactory.java b/framework/src/play/db/c3p0/C3P0DataSourceFactory.java
deleted file mode 100644
index c11b334170..0000000000
--- a/framework/src/play/db/c3p0/C3P0DataSourceFactory.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package play.db.c3p0;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-import play.Play;
-import play.db.Configuration;
-import play.db.DB;
-import play.db.DataSourceFactory;
-
-import javax.sql.DataSource;
-import java.beans.PropertyVetoException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.sql.SQLException;
-import java.util.Set;
-
-public class C3P0DataSourceFactory implements DataSourceFactory {
- @Override
- public DataSource createDataSource(Configuration dbConfig) throws PropertyVetoException, SQLException {
- ComboPooledDataSource ds = new ComboPooledDataSource();
- ds.setDriverClass(dbConfig.getProperty("db.driver"));
- ds.setJdbcUrl(dbConfig.getProperty("db.url"));
- ds.setUser(dbConfig.getProperty("db.user"));
- ds.setPassword(dbConfig.getProperty("db.pass"));
- ds.setAcquireIncrement(Integer.parseInt(dbConfig.getProperty("db.pool.acquireIncrement", "3")));
- ds.setAcquireRetryAttempts(Integer.parseInt(dbConfig.getProperty("db.pool.acquireRetryAttempts", "10")));
- ds.setAcquireRetryDelay(Integer.parseInt(dbConfig.getProperty("db.pool.acquireRetryDelay", "1000")));
- ds.setCheckoutTimeout(Integer.parseInt(dbConfig.getProperty("db.pool.timeout", "5000")));
- ds.setBreakAfterAcquireFailure(Boolean.parseBoolean(dbConfig.getProperty("db.pool.breakAfterAcquireFailure", "false")));
- ds.setMaxPoolSize(Integer.parseInt(dbConfig.getProperty("db.pool.maxSize", "30")));
- ds.setMinPoolSize(Integer.parseInt(dbConfig.getProperty("db.pool.minSize", "1")));
- ds.setInitialPoolSize(Integer.parseInt(dbConfig.getProperty("db.pool.initialSize", "1")));
- ds.setMaxIdleTimeExcessConnections(Integer.parseInt(dbConfig.getProperty("db.pool.maxIdleTimeExcessConnections", "0")));
- ds.setIdleConnectionTestPeriod(Integer.parseInt(dbConfig.getProperty("db.pool.idleConnectionTestPeriod", "10")));
- ds.setMaxIdleTime(Integer.parseInt(dbConfig.getProperty("db.pool.maxIdleTime", "0")));
- ds.setTestConnectionOnCheckin(Boolean.parseBoolean(dbConfig.getProperty("db.pool.testConnectionOnCheckin", "true")));
- ds.setTestConnectionOnCheckout(Boolean.parseBoolean(dbConfig.getProperty("db.pool.testConnectionOnCheckout", "false")));
- ds.setLoginTimeout(Integer.parseInt(dbConfig.getProperty("db.pool.loginTimeout", "0")));
- ds.setMaxAdministrativeTaskTime(Integer.parseInt(dbConfig.getProperty("db.pool.maxAdministrativeTaskTime", "0")));
- ds.setMaxConnectionAge(Integer.parseInt(dbConfig.getProperty("db.pool.maxConnectionAge", "0")));
- ds.setMaxStatements(Integer.parseInt(dbConfig.getProperty("db.pool.maxStatements", "0")));
- ds.setMaxStatementsPerConnection(Integer.parseInt(dbConfig.getProperty("db.pool.maxStatementsPerConnection", "0")));
- ds.setNumHelperThreads(Integer.parseInt(dbConfig.getProperty("db.pool.numHelperThreads", "3")));
- ds.setUnreturnedConnectionTimeout(Integer.parseInt(dbConfig.getProperty("db.pool.unreturnedConnectionTimeout", "0")));
- ds.setDebugUnreturnedConnectionStackTraces(Boolean.parseBoolean(dbConfig.getProperty("db.pool.debugUnreturnedConnectionStackTraces", "false")));
- ds.setContextClassLoaderSource("library");
- ds.setPrivilegeSpawnedThreads(true);
-
- if (dbConfig.getProperty("db.testquery") != null) {
- ds.setPreferredTestQuery(dbConfig.getProperty("db.testquery"));
- } else {
- String driverClass = dbConfig.getProperty("db.driver");
- /*
- * Pulled from http://dev.mysql.com/doc/refman/5.5/en/connector-j-usagenotes-j2ee-concepts-connection-pooling.html
- * Yes, the select 1 also needs to be in there.
- */
- if (driverClass.equals("com.mysql.jdbc.Driver")) {
- ds.setPreferredTestQuery("/* ping */ SELECT 1");
- }
- }
-
- // This check is not required, but here to make it clear that nothing changes for people
- // that don't set this configuration property. It may be safely removed.
- if(dbConfig.getProperty("db.isolation") != null) {
- ds.setConnectionCustomizerClassName(PlayConnectionCustomizer.class.getName());
- }
- return ds;
- }
-
- @Override
- public String getStatus() {
- StringWriter sw = new StringWriter();
- PrintWriter out = new PrintWriter(sw);
- Set dbNames = Configuration.getDbNames();
-
- for (String dbName : dbNames) {
- DataSource ds = DB.getDataSource(dbName);
- if (ds == null || !(ds instanceof ComboPooledDataSource)) {
- out.println("Datasource:");
- out.println("~~~~~~~~~~~");
- out.println("(not yet connected)");
- return sw.toString();
- }
- ComboPooledDataSource datasource = (ComboPooledDataSource) ds;
- out.println("Datasource (" + dbName + "):");
- out.println("~~~~~~~~~~~");
- out.println("Jdbc url: " + datasource.getJdbcUrl());
- out.println("Jdbc driver: " + datasource.getDriverClass());
- out.println("Jdbc user: " + datasource.getUser());
- if (Play.mode.isDev()) {
- out.println("Jdbc password: " + datasource.getPassword());
- }
- out.println("Min pool size: " + datasource.getMinPoolSize());
- out.println("Max pool size: " + datasource.getMaxPoolSize());
- try {
- out.println("Busy connection numbers: " + datasource.getNumBusyConnections());
- out.println("Idle connection numbers: " + datasource.getNumIdleConnections());
- out.println("Connection numbers: " + datasource.getNumConnections());
- } catch (SQLException e) {
- out.println("Connection status error: " + e.getMessage());
- }
- out.println("Initial pool size: " + datasource.getInitialPoolSize());
- out.println("Checkout timeout: " + datasource.getCheckoutTimeout());
- out.println("Test query : " + datasource.getPreferredTestQuery());
- out.println("\r\n");
- }
- return sw.toString();
- }
-
- @Override
- public String getDriverClass(DataSource ds) {
- return ((ComboPooledDataSource) ds).getDriverClass();
- }
-
- @Override
- public String getJdbcUrl(DataSource ds) {
- return ((ComboPooledDataSource) ds).getJdbcUrl();
- }
-
- @Override
- public String getUser(DataSource ds) {
- return ((ComboPooledDataSource) ds).getUser();
- }
-}
diff --git a/framework/src/play/db/c3p0/PlayConnectionCustomizer.java b/framework/src/play/db/c3p0/PlayConnectionCustomizer.java
deleted file mode 100644
index b6e53cbc4b..0000000000
--- a/framework/src/play/db/c3p0/PlayConnectionCustomizer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package play.db.c3p0;
-
-import com.mchange.v2.c3p0.ConnectionCustomizer;
-import play.Logger;
-import play.Play;
-import play.exceptions.DatabaseException;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Map;
-
-public class PlayConnectionCustomizer implements ConnectionCustomizer {
-
- public static final Map isolationLevels = Map.of(
- "NONE", Connection.TRANSACTION_NONE,
- "READ_UNCOMMITTED", Connection.TRANSACTION_READ_UNCOMMITTED,
- "READ_COMMITTED", Connection.TRANSACTION_READ_COMMITTED,
- "REPEATABLE_READ", Connection.TRANSACTION_REPEATABLE_READ,
- "SERIALIZABLE", Connection.TRANSACTION_SERIALIZABLE
- );
-
- @Override
- public void onAcquire(Connection c, String parentDataSourceIdentityToken) {
- Integer isolation = getIsolationLevel();
- if (isolation != null) {
- try {
- Logger.trace("Setting connection isolation level to %s", isolation);
- c.setTransactionIsolation(isolation);
- } catch (SQLException e) {
- throw new DatabaseException("Failed to set isolation level to " + isolation, e);
- }
- }
- }
-
- @Override
- public void onDestroy(Connection c, String parentDataSourceIdentityToken) {}
-
- @Override
- public void onCheckOut(Connection c, String parentDataSourceIdentityToken) {}
-
- @Override
- public void onCheckIn(Connection c, String parentDataSourceIdentityToken) {}
-
- /**
- * Get the isolation level from either the isolationLevels map, or by
- * parsing into an int.
- */
- private Integer getIsolationLevel() {
- String isolation = Play.configuration.getProperty("db.isolation");
- if (isolation == null) {
- return null;
- }
- Integer level = isolationLevels.get(isolation);
- if (level != null) {
- return level;
- }
-
- try {
- return Integer.valueOf(isolation);
- } catch (NumberFormatException e) {
- throw new DatabaseException("Invalid isolation level configuration" + isolation, e);
- }
- }
-}
diff --git a/framework/src/play/db/evolutions/Evolution.java b/framework/src/play/db/evolutions/Evolution.java
deleted file mode 100644
index 3c4c6d348a..0000000000
--- a/framework/src/play/db/evolutions/Evolution.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package play.db.evolutions;
-
-import play.libs.Codec;
-
-
-public class Evolution implements Comparable {
- public final int revision;
- public final String sql_up;
- public final String sql_down;
- public final String hash;
- public final boolean applyUp;
-
- public final String moduleKey;
-
- public Evolution(String moduleKey, int revision, String sql_up, String sql_down, boolean applyUp) {
- this.moduleKey = moduleKey;
- this.revision = revision;
- this.sql_down = sql_down;
- this.sql_up = sql_up;
- this.hash = Codec.hexSHA1(sql_up + sql_down);
- this.applyUp = applyUp;
- }
-
- @Override
- public int compareTo(Evolution o) {
- return this.revision - o.revision;
- }
-
- @Override
- public boolean equals(Object obj) {
- return (obj instanceof Evolution) && ((Evolution) obj).revision == this.revision;
- }
-
- @Override
- public int hashCode() {
- return revision;
- }
-}
\ No newline at end of file
diff --git a/framework/src/play/db/evolutions/EvolutionQuery.java b/framework/src/play/db/evolutions/EvolutionQuery.java
deleted file mode 100644
index 92ff710621..0000000000
--- a/framework/src/play/db/evolutions/EvolutionQuery.java
+++ /dev/null
@@ -1,289 +0,0 @@
-package play.db.evolutions;
-
-import java.sql.Connection;
-import java.sql.Date;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.sql.RowSet;
-import javax.sql.rowset.CachedRowSet;
-import javax.sql.rowset.RowSetProvider;
-
-import org.apache.commons.lang3.StringUtils;
-
-import play.Logger;
-import play.Play;
-import play.db.Configuration;
-import play.db.DB;
-import play.db.SQLSplitter;
-import play.db.jpa.JPAPlugin;
-import play.exceptions.UnexpectedException;
-
-
-public class EvolutionQuery{
-
- public static void createTable(String dbName) throws SQLException {
- // If you are having problems with the default datatype text (clob for Oracle), you can
- // specify your own datatype using the 'evolution.PLAY_EVOLUTIONS.textType'-property
- String textDataType = Play.configuration.getProperty("evolution.PLAY_EVOLUTIONS.textType");
- if (textDataType == null) {
- if (isOracleDialectInUse(dbName)) {
- textDataType = "clob";
- } else {
- textDataType = "text";
- }
- }
-
- execute(dbName, "create table play_evolutions (id int not null, hash varchar(255) not null, applied_at timestamp not null, apply_script " + textDataType + ", revert_script " + textDataType + ", state varchar(255), last_problem " + textDataType + ", module_key varchar(255), constraint pk_id_module_key primary key (id, module_key))");
- }
-
- public static void alterForModuleSupport(String dbName, Connection connection) throws SQLException{
- // Add new column
- PreparedStatement ps1 = connection.prepareStatement("alter table play_evolutions add module_key varchar(255);");
- ps1.execute();
- closeStatement(ps1);
-
- // Set default value Assigning any existing evolutions to the parent project
- System.out.println("!!! - Assigning any existing evolutions to the parent project - !!!");
- PreparedStatement statement = connection.prepareStatement("update play_evolutions set module_key = ? where module_key is null");
- statement.setString(1, Play.configuration.getProperty("application.name"));
- statement.execute();
- closeStatement(statement);
-
-
- if(isMySqlDialectInUse(dbName)){
- // Drop previous primary key
- PreparedStatement ps2 = connection.prepareStatement( "alter table play_evolutions drop primary key;");
- ps2.execute();
- closeStatement(ps2);
- }else{
- // Drop previous primary key
- PreparedStatement ps3 = connection.prepareStatement("alter table play_evolutions drop constraint play_evolutions_pkey;");
- ps3.execute();
- closeStatement(ps3);
- }
-
- // Add new primary key
- PreparedStatement ps4 = connection.prepareStatement("alter table play_evolutions add constraint pk_id_module_key primary key (id,module_key);");
- ps4.execute();
- closeStatement(ps4);
- }
-
- public static void resolve(String dbName, int revision, String moduleKey) throws SQLException {
- Connection connection = getNewConnection(dbName);
- PreparedStatement ps = connection.prepareStatement("update play_evolutions set state = ?, last_problem = ? where state = ? and id = ? and module_key = ?" );
- ps.setString(1, EvolutionState.APPLIED.getStateWord() );
- ps.setString(2, "");
- ps.setString(3, EvolutionState.APPLYING_UP.getStateWord() );
- ps.setInt(4, revision);
- ps.setString(5, moduleKey);
- ps.execute();
- closeStatement(ps);
-
- PreparedStatement ps2 = connection.prepareStatement("delete from play_evolutions where state = ? and id = ? and module_key = ?" );
- ps2.setString(1, EvolutionState.APPLYING_DOWN.getStateWord() );
- ps2.setInt(2, revision);
- ps2.setString(3, moduleKey);
- ps2.execute();
- closeStatement(ps2);
- }
-
- public static void apply(Connection connection, boolean runScript, Evolution evolution, String moduleKey) throws SQLException {
- if (evolution.applyUp) {
- PreparedStatement ps = connection.prepareStatement("insert into play_evolutions values(?, ?, ?, ?, ?, ?, ?, ?)");
- ps.setInt(1, evolution.revision);
- ps.setString(2, evolution.hash);
- ps.setDate(3, new Date(System.currentTimeMillis()));
- ps.setString(4, evolution.sql_up);
- ps.setString(5, evolution.sql_down);
- ps.setString(6, EvolutionState.APPLYING_UP.getStateWord());
- ps.setString(7, "");
- ps.setString(8, moduleKey);
- ps.execute();
- } else {
- PreparedStatement ps = connection.prepareStatement("update play_evolutions set state = ? where id = ? and module_key = ?" );
- ps.setString(1, EvolutionState.APPLYING_DOWN.getStateWord() );
- ps.setInt(2, evolution.revision);
- ps.setString(3, moduleKey);
- ps.execute();
- }
-
- // Execute script
- if (runScript) {
- for (CharSequence sql : new SQLSplitter((evolution.applyUp ? evolution.sql_up : evolution.sql_down))) {
- String s = sql.toString().trim();
- if (StringUtils.isEmpty(s)) {
- continue;
- }
- connection.createStatement().execute(s);
- }
- }
- // Insert into logs
- if (evolution.applyUp) {
- PreparedStatement ps = connection.prepareStatement("update play_evolutions set state = ?, last_problem = ? where id = ? and module_key = ?");
- ps.setString(1, EvolutionState.APPLIED.getStateWord() );
- ps.setString(2, "");
- ps.setInt(3, evolution.revision);
- ps.setString(4, moduleKey);
- ps.execute();
- } else {
- PreparedStatement ps = connection.prepareStatement("delete from play_evolutions where id = ? and module_key = ?");
- ps.setInt(1, evolution.revision);
- ps.setString(2, moduleKey);
- ps.execute();
- }
- }
-
- public static void setProblem(Connection connection, int applying,
- String moduleKey, String message) throws SQLException {
- PreparedStatement ps = connection.prepareStatement("update play_evolutions set last_problem = ? where id = ? and module_key = ?");
- ps.setString(1, message);
- ps.setInt(2, applying);
- ps.setString(3, moduleKey);
- ps.execute();
- }
-
-
- public static RowSet getEvolutionsToApply(Connection connection, String moduleKey) throws SQLException {
- PreparedStatement statement = null;
- ResultSet resultSet = null;
- try {
- statement = connection
- .prepareStatement("select id, hash, apply_script, revert_script, state, last_problem from play_evolutions where module_key = ? and state like 'applying_%'");
- statement.setString(1, moduleKey);
- resultSet = statement.executeQuery();
- // Need to use a CachedRowSet that caches its rows in memory, which
- // makes it possible to operate without always being connected to
- // its data source
- CachedRowSet rowset = RowSetProvider.newFactory().createCachedRowSet();
- rowset.populate(resultSet);
- return rowset;
- } catch (SQLException e) {
- throw e;
- } finally {
- closeResultSet(resultSet);
- closeStatement(statement);
- }
- }
-
- public static RowSet getEvolutions(Connection connection, String moduleKey) throws SQLException {
- PreparedStatement statement = null;
- ResultSet resultSet = null;
- try {
- statement = connection
- .prepareStatement("select id, hash, apply_script, revert_script from play_evolutions where module_key = ?");
- statement.setString(1, moduleKey);
- resultSet = statement.executeQuery();
- // Need to use a CachedRowSet that caches its rows in memory, which
- // makes it possible to operate without always being connected to
- // its data source
- CachedRowSet rowset = RowSetProvider.newFactory().createCachedRowSet();
- rowset.populate(resultSet);
- return rowset;
- } catch (SQLException e) {
- throw e;
- } finally {
- closeResultSet(resultSet);
- closeStatement(statement);
- }
- }
-
- // JDBC Utils
- private static void execute(String dbName, String sql) throws SQLException {
- Connection connection = null;
- Statement statement = null;
- try {
- connection = getNewConnection(dbName);
- statement = connection.createStatement();
- statement.execute(sql);
- } catch (SQLException e) {
- throw e;
- } finally {
- closeStatement(statement);
- closeConnection(connection);
- }
- }
-
- public static Connection getNewConnection() throws SQLException {
- return getNewConnection(DB.DEFAULT, true); // Yes we want auto-commit
- }
-
- public static Connection getNewConnection(String dbName) throws SQLException {
- return getNewConnection(dbName, true); // Yes we want auto-commit
- }
-
- public static Connection getNewConnection(String dbName, boolean autoCommit) throws SQLException {
- Connection connection = DB.getDataSource(dbName).getConnection();
- connection.setAutoCommit(autoCommit);
- return connection;
- }
-
- public static void closeResultSet(ResultSet resultSet) {
- try {
- if (resultSet != null) {
- resultSet.close();
- }
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static void closeStatement(Statement statement) {
- try {
- if (statement != null) {
- statement.close();
- }
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- public static void closeConnection(Connection connection) {
- try {
- if (connection != null) {
- connection.close();
- }
- } catch (Exception e) {
- throw new UnexpectedException(e);
- }
- }
-
- private static synchronized boolean isOracleDialectInUse(String dbName) {
- boolean isOracle = false;
- Configuration dbConfig = new Configuration(dbName);
- String jpaDialect = JPAPlugin.getDefaultDialect(dbConfig.getProperty("db.driver"));
- if (jpaDialect != null) {
- try {
- Class dialectClass = Play.classloader.loadClass(jpaDialect);
-
- // Oracle 8i dialect is the base class for oracle dialects (at least for now)
- isOracle = org.hibernate.dialect.Oracle8iDialect.class.isAssignableFrom(dialectClass);
- } catch (ClassNotFoundException e) {
- // swallow
- Logger.warn("jpa.dialect class %s not found", jpaDialect);
- }
- }
- return isOracle;
- }
-
- private static boolean isMySqlDialectInUse(String dbName) {
- boolean isMySQl = false;
- Configuration dbConfig = new Configuration(dbName);
- String jpaDialect = JPAPlugin.getDefaultDialect(dbConfig.getProperty("db.driver"));
- if (jpaDialect != null) {
- try {
- Class dialectClass = Play.classloader.loadClass(jpaDialect);
-
- // MySQLDialect is the base class for MySQL dialects
- isMySQl = org.hibernate.dialect.MySQLDialect.class.isAssignableFrom(dialectClass);
- } catch (ClassNotFoundException e) {
- // swallow
- Logger.warn("jpa.dialect class %s not found", jpaDialect);
- }
- }
- return isMySQl;
- }
-
-}
\ No newline at end of file
diff --git a/framework/src/play/db/evolutions/EvolutionState.java b/framework/src/play/db/evolutions/EvolutionState.java
deleted file mode 100644
index 5cebdef112..0000000000
--- a/framework/src/play/db/evolutions/EvolutionState.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package play.db.evolutions;
-
-public enum EvolutionState {
- APPLIED, APPLYING_UP, APPLYING_DOWN;
-
- public String getStateWord() {
- return this.name().toLowerCase();
- }
-}
diff --git a/framework/src/play/db/evolutions/exceptions/InconsistentDatabase.java b/framework/src/play/db/evolutions/exceptions/InconsistentDatabase.java
deleted file mode 100644
index a2faea9308..0000000000
--- a/framework/src/play/db/evolutions/exceptions/InconsistentDatabase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package play.db.evolutions.exceptions;
-
-import play.exceptions.PlayException;
-
-//Exceptions
-public class InconsistentDatabase extends PlayException {
- /**
- * The name of the Database concern by the exception
- */
- private final String dbName;
- private final String evolutionScript;
- private final String error;
- private final int revision;
- private final String moduleKey;
-
- public InconsistentDatabase(String dbName, String evolutionScript, String error, int revision, String moduleKey) {
- this.dbName = dbName;
- this.evolutionScript = evolutionScript;
- this.error = error;
- this.revision = revision;
- this.moduleKey = moduleKey;
- }
-
- public String getDbName() {
- return this.dbName;
- }
-
- public String getEvolutionScript() {
- return this.evolutionScript;
- }
-
- public String getError() {
- return this.error;
- }
-
- public int getRevision() {
- return this.revision;
- }
-
-
- @Override
- public String getErrorTitle() {
- return "Your database is an inconsistent state!";
- }
-
- @Override
- public String getErrorDescription() {
- return "An evolution has not been applied properly. Please check the problem and resolve it manually before making it as resolved.";
- }
-
- @Override
- public String getMoreHTML() {
- return "This SQL script has been run, and there was a problem:
" + evolutionScript + "
This error has been thrown:
" + error + "
";
- }
-}
diff --git a/framework/src/play/db/evolutions/exceptions/InvalidDatabaseRevision.java b/framework/src/play/db/evolutions/exceptions/InvalidDatabaseRevision.java
deleted file mode 100644
index a952f9115d..0000000000
--- a/framework/src/play/db/evolutions/exceptions/InvalidDatabaseRevision.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package play.db.evolutions.exceptions;
-
-import play.exceptions.PlayException;
-
-//Exceptions
-public class InvalidDatabaseRevision extends PlayException {
-
- /**
- * The name of the Database concern by the exception
- */
- private final String dbName;
- private final String evolutionScript;
-
- public InvalidDatabaseRevision(String dbName, String evolutionScript) {
- this.dbName = dbName;
- this.evolutionScript = evolutionScript;
- }
-
- public String getDbName() {
- return this.dbName;
- }
-
- public String getEvolutionScript() {
- return evolutionScript;
- }
-
- @Override
- public String getErrorTitle() {
- return "Your database needs evolution!";
- }
-
- @Override
- public String getErrorDescription() {
- return "An SQL script will be run on your database.";
- }
-
- @Override
- public String getMoreHTML() {
- return "This SQL script must be run:
" + evolutionScript + "
";
- }
-}
diff --git a/framework/src/play/db/helper/JdbcHelper.java b/framework/src/play/db/helper/JdbcHelper.java
deleted file mode 100644
index 0b7ee20d3d..0000000000
--- a/framework/src/play/db/helper/JdbcHelper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package play.db.helper;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-import play.db.DB;
-
-public class JdbcHelper {
-
- private JdbcHelper() {
- }
-
- public static ResultSet execute(String sql, Object ... params) throws SQLException {
- PreparedStatement pst = DB.getConnection().prepareStatement(sql, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
- int index = 0;
- for (Object param : params) {
- pst.setObject(++index, param);
- }
- return pst.executeQuery();
- }
-
- public static ResultSet executeList(String sql, List