mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-04 05:53:43 +00:00 
			
		
		
		
	retention: Inline move_rows query arguments.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							73374996a5
						
					
				
				
					commit
					b4b8691239
				
			@@ -109,14 +109,11 @@ def move_rows(
 | 
			
		||||
    fields = [field for field in base_model._meta.fields if field not in EXCLUDE_FIELDS]
 | 
			
		||||
    src_fields = [Identifier(src_db_table, field.column) for field in fields]
 | 
			
		||||
    dst_fields = [Identifier(field.column) for field in fields]
 | 
			
		||||
    sql_args = {
 | 
			
		||||
        "src_fields": SQL(",").join(src_fields),
 | 
			
		||||
        "dst_fields": SQL(",").join(dst_fields),
 | 
			
		||||
    }
 | 
			
		||||
    sql_args.update(kwargs)
 | 
			
		||||
    with connection.cursor() as cursor:
 | 
			
		||||
        cursor.execute(
 | 
			
		||||
            raw_query.format(**sql_args),
 | 
			
		||||
            raw_query.format(
 | 
			
		||||
                src_fields=SQL(",").join(src_fields), dst_fields=SQL(",").join(dst_fields), **kwargs
 | 
			
		||||
            )
 | 
			
		||||
        )
 | 
			
		||||
        if returning_id:
 | 
			
		||||
            return [id for (id,) in cursor.fetchall()]  # return list of row ids
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user