Attachment 6965 Details for Bug 38645 – fix_brackets.patch

[patch] fix_brackets.patch

fix_brackets.patch (text/plain), 2.06 KB, created by Arvid Requate on 2015-06-15 19:01:53 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2015-06-15 19:01:53 CEST

Size: 2.06 KB

patch

obsolete

>Index: modules/univention/s4connector/s4cache.py
>===================================================================
>--- modules/univention/s4connector/s4cache.py	(Revision 61258)
>+++ modules/univention/s4connector/s4cache.py	(Arbeitskopie)
>@@ -276,7 +276,7 @@
> 			for value in entry[attr]:
> 				sql_commands.append(
> 					(
>-						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", [str(guid_id), str(attr_id), _encode_base64(value)]
>+						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", (str(guid_id), str(attr_id), _encode_base64(value))
> 					)
> 				)
> 
>@@ -297,8 +297,8 @@
> 				(
> 				"DELETE FROM data WHERE data.id IN (\
> 				SELECT data.id FROM DATA INNER JOIN ATTRIBUTES ON data.attribute_id=attributes.id \
>-					where attributes.attribute=? and guid_id =? \
>-				);", [ (str(attribute),), (str(guid_id),)]
>+					where attributes.attribute=? and guid_id=? \
>+				);", (str(attribute), str(guid_id))
> 				)
> 			)
> 		for attribute in diff['added']:
>@@ -306,7 +306,7 @@
> 			for value in entry[attribute]:
> 				sql_commands.append(
> 					(
>-						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", [str(guid_id), str(attr_id), _encode_base64(value)]
>+						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", (str(guid_id), str(attr_id), _encode_base64(value))
> 					)
> 				)
> 		for attribute in diff['changed']:
>@@ -317,13 +317,13 @@
> 						"DELETE FROM data WHERE data.id IN (\
> 							SELECT data.id FROM DATA INNER JOIN ATTRIBUTES ON data.attribute_id=attributes.id \
> 							where attributes.id=? and guid_id = ? and value = ? \
>-						);", [str(attr_id), str(guid_id), _encode_base64(value)]
>+						);", (str(attr_id), str(guid_id), _encode_base64(value))
> 					)
> 				)
> 			for value in set(entry.get(attribute)) - set(old_entry.get(attribute)):
> 				sql_commands.append(
> 					(
>-						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", [str(guid_id), str(attr_id), _encode_base64(value)]
>+						"INSERT INTO DATA(guid_id,attribute_id,value) VALUES(?,?,?);", (str(guid_id), str(attr_id), _encode_base64(value))
> 					)
> 				)
>

Actions: View | Diff

Attachments on bug 38645: 6938 | 6965