Merge branch 'insert_update' into 'development'

updating insert functions

See merge request !16

database/actions.py

@@ -53,6 +53,7 @@ def temporary_data(connection, file_name, table, year, offset=2,
     table.populate_temporary(ttable, file_name, header, year, delimiters, null, offset, bind=connection)
 
     table.apply_derivatives(ttable, ttable.columns.keys(), year, bind=connection)
+
     table.add_pk_to_temporary(ttable, bind=connection)
 
     return ttable

database/database_table.py

@@ -908,10 +908,13 @@ class DatabaseTable(Table):
         '''
         if bind is None:
             bind = self.metadata.bind
-
+		
         for original in columns:
             self._resolv_derivative(original, year)
 
+        if (len(self._derivatives) == 0):
+            return;
+
         max_level = max([self._derivatives[d]['level'] for d in self._derivatives])
 
         for i in range(1, max_level + 1):