/ - Diff - BIEN 3 - NCEAS Projects

« Previous | Next »

Revision 2760

sql.py: create_table(): Add indexes on all non-pkey columns, unless turned off or deferred using new param col_indexes

         run_query(db, 'ALTER TABLE '+table+' ADD COLUMN '+row_num_col
             +' serial NOT NULL PRIMARY KEY', log_level=3)
     def create_table(db, table, cols, has_pkey=True):
     def create_table(db, table, cols, has_pkey=True, col_indexes=True):
         '''Creates a table.
         @param cols [sql_gen.TypedCol,...] The column names and types
         @param has_pkey If set, the first column becomes the primary key.
         @param col_indexes bool|[ref]
             * If True, indexes will be added on all non-pkey columns.
             * If a list reference, [0] will be set to a function to do this.
               This can be used to delay index creation until the table is populated.
         '''
         table = sql_gen.as_Table(table)
-...
         str_ += '\n, '.join(v.to_str(db) for v in cols)
         str_ += '\n);\n'
         run_query(db, str_, cacheable=True, log_level=2)
         # Add indexes
         if has_pkey: index_cols = cols[1:]
         else: index_cols = cols
         def add_indexes():
             for col in index_cols: add_index(db, col.to_Col(), table)
         if isinstance(col_indexes, list): col_indexes[0] = add_indexes # defer
         elif col_indexes: add_indexes() # add now
     def vacuum(db, table):
         table = sql_gen.as_Table(table)

             def load_():
                 log('Creating table')
                 sql.create_table(db, table, typed_cols)
                 sql.create_table(db, table, typed_cols, col_indexes=False)
                 # Create COPY FROM statement
                 if use_copy_from[0]:
-...
                 sql_gen.TypedCol('error', 'text NOT NULL'),
+                ]
             sql.create_table(db, errors_table, typed_cols, has_pkey=False)
             for col in typed_cols: sql.add_index(db, col.to_Col(), errors_table)
             index_cols = ['column', sql_gen.EnsureNotNull('value'), 'error_code',
                 'error']
             sql.add_index(db, index_cols, errors_table, unique=True)

Also available in: Unified diff