You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by de...@apache.org on 2016/11/09 10:59:21 UTC
[14/14] empire-db git commit: EMPIREDB-247
EMPIREDB-247
- better naming of API
- clarify usage in docs
Project: http://git-wip-us.apache.org/repos/asf/empire-db/repo
Commit: http://git-wip-us.apache.org/repos/asf/empire-db/commit/74313783
Tree: http://git-wip-us.apache.org/repos/asf/empire-db/tree/74313783
Diff: http://git-wip-us.apache.org/repos/asf/empire-db/diff/74313783
Branch: refs/heads/EMPIREDB-247
Commit: 74313783814a95d859a2107de78618ccc06383e1
Parents: 890fa48
Author: Jan Glaubitz <ja...@glaubitz.org>
Authored: Fri Aug 12 12:31:25 2016 +0200
Committer: Jan Glaubitz <ja...@glaubitz.org>
Committed: Wed Nov 9 11:56:53 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/empire/db/DBCommand.java | 8 ++++----
.../src/main/java/org/apache/empire/db/DBDatabase.java | 10 +++++-----
.../org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/empire-db/blob/74313783/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
----------------------------------------------------------------------
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
index 6941cc8..786fdbe 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBCommand.java
@@ -1132,16 +1132,16 @@ public abstract class DBCommand extends DBCommandExpr
}
/**
- * Creates the Insert or Update ("UPSERT") SQL-Command.
+ * Creates the INSERT or UPDATE ("UPSERT") SQL-Command.
*
- * This depends on your Database (driver) and might not be supported.
+ * This depends on your Database(driver) and might not be supported.
* Check DBDatabaseDriver.isSupported(PERFORM_UPSERT)
*
* @return the SQL-Command
*/
- public synchronized String getInsertOrUpdate()
+ public synchronized String getUpdateOrInsert()
{
- throw new NotSupportedException(this, "getInsertOrUpdate");
+ throw new NotSupportedException(this, "getUpdateOrInsert");
}
/**
http://git-wip-us.apache.org/repos/asf/empire-db/blob/74313783/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
----------------------------------------------------------------------
diff --git a/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java b/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
index 5d84c30..a0d24e8 100644
--- a/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
+++ b/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
@@ -1387,10 +1387,11 @@ public abstract class DBDatabase extends DBObject
}
/**
- * Executes an Insert or Update Statement from a command object
+ * Executes an UPDATE or INSERT Statement from a command object
*
- * This depends on your Database (driver) and might not be supported.
- * Check DBDatabaseDriver.isSupported(PERFORM_UPSERT)
+ * Depending on your database(driver) this might be supported
+ * in one single statement (Check DBDatabaseDriver.isSupported(PERFORM_UPSERT)),
+ * or as fallback with an UPDATE, followed by an INSERT if nothing was updated.
*
* @param cmd the command object containing the update command
* @param conn a valid connection to the database.
@@ -1400,11 +1401,10 @@ public abstract class DBDatabase extends DBObject
{
if (getDriver().isSupported(DBDriverFeature.PERFORM_UPSERT))
{
- return executeSQL(cmd.getInsertOrUpdate(), cmd.getParamValues(), conn);
+ return executeSQL(cmd.getUpdateOrInsert(), cmd.getParamValues(), conn);
}
else
{
- log.warn("{} is not supported by your Database(driver). Falling back to two statements");
int count = executeUpdate(cmd, conn);
if (count < 1) {
// nothing updated -> INSERT
http://git-wip-us.apache.org/repos/asf/empire-db/blob/74313783/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
----------------------------------------------------------------------
diff --git a/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java b/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
index 2429660..a02f7d8 100644
--- a/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
+++ b/empire-db/src/main/java/org/apache/empire/db/mysql/DBDatabaseDriverMySQL.java
@@ -123,7 +123,7 @@ public class DBDatabaseDriverMySQL extends DBDatabaseDriver
}
@Override
- public synchronized String getInsertOrUpdate()
+ public synchronized String getUpdateOrInsert()
{
StringBuilder buf = new StringBuilder(getInsert());
buf.append(" ON DUPLICATE KEY UPDATE ");