Project

General

Profile

« Previous | Next » 

Revision 2268

Added by Aaron Marcuse-Kubitza over 12 years ago

sql.py: put_table(): Return a sql_gen.Col object instead of an old-style tuple

View differences:

db_xml.py
6 6 

  		




  7
  7
  
    
import exc


  		




  8
  8
  
    
import sql


  		




  
  9
  
    
import sql_gen


  		




  9
  10
  
    
import strings


  		




  10
  11
  
    
import util


  		




  11
  12
  
    
import xml_dom


  		




  ......




  172
  173
  
    
    # Divide fields into input columns and literal values


  		




  173
  174
  
    
    in_tables = [qual_name(in_table)]


  		




  174
  175
  
    
    for out_col, value in row.iteritems():


  		




  175
  
  
    
        if isinstance(value, tuple): # value is temp table column


  		




  176
  
  
    
            in_tables.append(value[0])


  		




  
  176
  
    
        if isinstance(value, sql_gen.Col): # value is temp table column


  		




  
  177
  
    
            in_tables.append(value.table)


  		




  177
  178
  
    
        elif util.is_str(value) and value.startswith(input_col_prefix):


  		




  178
  179
  
    
            # value is input column


  		




  179
  180
  
    
            row[out_col] = strings.remove_prefix(input_col_prefix, value)


  		












Also available in:  Unified diff