Lior Vernia has uploaded a new change for review.

Change subject: core: Swap apostrophes for $-tag
......................................................................

core: Swap apostrophes for $-tag

Older versions of Postgresql, such as the one currently used on RHEL,
would escape the backslashes between apostrophes. Using $-tag prevents
these backslashes being escaped (on both older and newer versions).

Change-Id: Icba1c75cd317589910e64f7ee6237fcb23a346ee
Bug-Url: https://bugzilla.redhat.com/1119214
Signed-off-by: Lior Vernia <lver...@redhat.com>
---
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/90/30190/1

diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql 
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index e3855c9..a66f10f 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -716,7 +716,7 @@
 select fn_db_add_config_value('NetworkCustomPropertiesSupported', 'false', 
'3.2');
 select fn_db_add_config_value('NetworkCustomPropertiesSupported', 'false', 
'3.3');
 select fn_db_add_config_value('NetworkCustomPropertiesSupported', 'false', 
'3.4');
-select fn_db_add_config_value('PreDefinedNetworkCustomProperties', 
'bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$', '3.5');
+select fn_db_add_config_value('PreDefinedNetworkCustomProperties', 
$q$bridge_opts=^[^\s=]+=[^\s=]+(\s+[^\s=]+=[^\s=]+)*$$q$, '3.5'); -- tag 
prevents psql from escaping backslashes ('q' is arbitrary)
 select fn_db_add_config_value('UserDefinedNetworkCustomProperties', '', '3.5');
 
 select fn_db_add_config_value('SshSoftFencingCommand', 'service vdsmd 
restart', '3.0');


-- 
To view, visit http://gerrit.ovirt.org/30190
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icba1c75cd317589910e64f7ee6237fcb23a346ee
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Lior Vernia <lver...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to