diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-12-14 22:34:28 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-15 10:11:49 +0000 |
| commit | e61ddefe447cc024f0c05144dae73c1cbd3a9b59 (patch) | |
| tree | 782efe097ec09481f82eeeb96a64ff856256e57b /server/src | |
| parent | f341dac68a5c47049431b5e857e710c6b0d985e0 (diff) | |
| download | vaadin-framework-e61ddefe447cc024f0c05144dae73c1cbd3a9b59.tar.gz vaadin-framework-e61ddefe447cc024f0c05144dae73c1cbd3a9b59.zip | |
Throw IllegalArgumentException on non-existent version column. (#15290)
Change-Id: I68fdea1144253feba906acd882b573d469f39a30
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 84dfe9b865..21a486a017 100644 --- a/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/server/src/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -262,6 +262,12 @@ public class DefaultSQLGenerator implements SQLGenerator { count++; } if (versionColumn != null) { + if(!item.getItemPropertyIds().contains(versionColumn)) { + throw new IllegalArgumentException(String.format( + "Table '%s' does not contain version column '%s'.", + tableName, versionColumn)); + } + query.append(String.format(" AND %s = ?", QueryBuilder.quote(versionColumn))); sh.addParameterValue( |