Juan Hernandez has uploaded a new change for review.
Change subject: core: Remove deprecated Postgres options
......................................................................
core: Remove deprecated Postgres options
These are no longer needed.
Change-Id: I6f7d76256490ada9c1b31020e87577523f6451fc
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
2 files changed, 6 insertions(+), 26 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/9682/1
diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
index e816343..d288d38 100644
--- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -343,11 +343,6 @@
select fn_db_add_config_value('PosixStorageEnabled','false','3.0');
select fn_db_add_config_value('PosixStorageEnabled','true','3.1');
select fn_db_add_config_value('PosixStorageEnabled','true','3.2');
-select fn_db_add_config_value('PostgresI18NPrefix','','general');
-select fn_db_add_config_value('PostgresLikeSyntax','ILIKE','general');
-select fn_db_add_config_value('PostgresPagingSyntax',E' OFFSET (%1$s -1) LIMIT
%2$s','general');
-select fn_db_add_config_value('PostgresPagingType','Offset','general');
-select fn_db_add_config_value('PostgresSearchTemplate',E'SELECT * FROM (%2$s)
%1$s) as T1 %3$s','general');
--Handling Allow Running Guests Without Tools
select
fn_db_add_config_value('PowerClientAllowRunningGuestsWithoutTools','false','general');
select fn_db_add_config_value('PowerClientAllowUsingAsIRS','false','general');
@@ -668,6 +663,12 @@
select fn_db_delete_config_value('SQLServerPagingSyntax','general');
select fn_db_delete_config_value('SQLServerPagingType','general');
select fn_db_delete_config_value('SQLServerSearchTemplate','general');
+select fn_db_delete_config_value('PostgresI18NPrefix','general');
+select fn_db_delete_config_value('PostgresLikeSyntax','general');
+select fn_db_delete_config_value('PostgresPagingSyntax','general');
+select fn_db_delete_config_value('PostgresPagingType','general');
+select fn_db_delete_config_value('PostgresSearchTemplate','general');
+
------------------------------------------------------------------------------------
-- Split config section
-- The purpose of this section is to treat config option that was once
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
index 4125557..d09dc02 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
@@ -778,18 +778,6 @@
DBSearchTemplate(219),
// Do not use those (used internally)
@Deprecated
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute(" OFFSET {0} LIMIT {1}")
- PostgresPagingSyntax(223),
- @Deprecated
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("Offset")
- PostgresPagingType(224),
- @Deprecated
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("SELECT * FROM ( {1}) as T1 {2}")
- PostgresSearchTemplate(225),
- @Deprecated
@TypeConverterAttribute(Boolean.class)
@DefaultValueAttribute("false")
LogDBCommands(226),
@@ -1032,11 +1020,6 @@
realValue = "LikeSyntax")
DBLikeSyntax(298),
- @Deprecated
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("ILIKE")
- PostgresLikeSyntax(300),
-
@TypeConverterAttribute(String.class)
@DefaultValueAttribute("")
@OptionBehaviourAttribute(behaviour = OptionBehaviour.ValueDependent,
dependentOn = ConfigValues.DBEngine,
@@ -1046,10 +1029,6 @@
@TypeConverterAttribute(String.class)
@DefaultValueAttribute("N")
SQLI18NPrefix(302),
- @Deprecated
- @TypeConverterAttribute(String.class)
- @DefaultValueAttribute("")
- PostgresI18NPrefix(303),
@Reloadable
@TypeConverterAttribute(Integer.class)
--
To view, visit http://gerrit.ovirt.org/9682
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f7d76256490ada9c1b31020e87577523f6451fc
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
