diff --git a/src/db/database.rs b/src/db/database.rs
index 5995f8b..d480596 100644
--- a/src/db/database.rs
+++ b/src/db/database.rs
@@ -72,7 +72,7 @@ impl Database {
                 Ok(None)
             }
             SqlStatement::AlterTable(statement) => {
-                alter_table::alter_table(self, statement)?;
+                alter_table::alter_table(self, statement, self.transaction.is_some())?;
                 self.append_to_transaction(sql_statement_clone, vec![])?;
                 Ok(None)
             }
diff --git a/src/db/table/alter_table/mod.rs b/src/db/table/alter_table/mod.rs
index 36d478d..44a2a92 100644
--- a/src/db/table/alter_table/mod.rs
+++ b/src/db/table/alter_table/mod.rs
@@ -2,35 +2,34 @@ use crate::db::database::Database;
 use crate::db::table::Value;
 use crate::interpreter::ast::{AlterTableAction, AlterTableStatement};
 
-pub fn alter_table(database: &mut Database, statement: AlterTableStatement) -> Result<(), String> {
+pub fn alter_table(
+    database: &mut Database,
+    statement: AlterTableStatement,
+    is_transaction: bool,
+) -> Result<(), String> {
     return match statement.action {
         AlterTableAction::RenameTable { new_table_name } => {
-            // TODO: add transaction support to table name changes
             let table = database.tables.remove(&statement.table_name);
             match table {
-                Some(table) => database.tables.insert(new_table_name, table),
+                Some(mut table) => {
+                    table.name = new_table_name;
+                    database.tables.insert(table.name.clone(), table);
+                }
                 None => return Err(format!("Table `{}` does not exist", statement.table_name)),
             };
             Ok(())
         }
         AlterTableAction::RenameColumn {
-            // TODO: add transaction support to column name changes
             old_column_name,
             new_column_name,
         } => {
             let table = database.get_table_mut(&statement.table_name)?;
-            if !table.has_column(&old_column_name) {
-                return Err(format!(
-                    "Column `{}` does not exist in table `{}`",
-                    old_column_name, statement.table_name
-                ));
-            }
-            table.get_columns_mut().iter_mut().for_each(|column| {
-                if column.name == old_column_name {
-                    column.name = new_column_name.clone();
-                }
-            });
-            Ok(())
+            table.columns.rename_column(
+                &old_column_name,
+                &new_column_name,
+                &table.name,
+                is_transaction,
+            )
         }
         AlterTableAction::AddColumn { column_def } => {
             let table = database.get_table_mut(&statement.table_name)?;
@@ -54,10 +53,13 @@ pub fn alter_table(database: &mut Database, statement: AlterTableStatement) -> R
                     column_name, statement.table_name
                 ));
             }
-            let index = table.get_index_of_column(&column_name)?;
+            let index = table.columns.get_index_of_column(&column_name)?;
+            table
+                .columns
+                .drop_column(&column_name, &table.name, is_transaction)?;
             // This is kind of bad because it's an O(n^2) operation however SQLite
             // preserves the order of the columns after drop column statements.
-            table.columns.remove(index);
+
             table.get_rows_mut().iter_mut().for_each(|row| {
                 row.remove(index);
             });
@@ -81,10 +83,11 @@ mod tests {
                 new_table_name: "new_users".to_string(),
             },
         };
-        let result = alter_table(&mut database, statement);
+        let result = alter_table(&mut database, statement, false);
         assert!(result.is_ok());
         assert!(!database.tables.contains_key("users"));
         assert!(database.tables.contains_key("new_users"));
+        assert!(database.tables.get("new_users").unwrap().name == "new_users");
     }
 
     #[test]
@@ -97,7 +100,7 @@ mod tests {
                 new_column_name: "new_name".to_string(),
             },
         };
-        let result = alter_table(&mut database, statement);
+        let result = alter_table(&mut database, statement, false);
         assert!(result.is_ok());
         let table = database.get_table("users");
         assert!(table.is_ok());
@@ -123,13 +126,13 @@ mod tests {
                 },
             },
         };
-        let result = alter_table(&mut database, statement);
+        let result = alter_table(&mut database, statement, false);
         assert!(result.is_ok());
         let table = database.get_table("users");
         assert!(table.is_ok());
         let table = table.unwrap();
         assert!(table.get_columns().last().unwrap().name == "new_column");
-        assert!(table.columns.len() == table[0].len());
+        assert!(table.get_columns().len() == table[0].len());
         assert!(
             table
                 .get_rows()
@@ -147,7 +150,7 @@ mod tests {
                 column_name: "age".to_string(),
             },
         };
-        let result = alter_table(&mut database, statement);
+        let result = alter_table(&mut database, statement, false);
         assert!(result.is_ok());
         let table = database.get_table("users");
         assert!(table.is_ok());
@@ -158,7 +161,7 @@ mod tests {
                 .iter()
                 .any(|column| column.name == "age")
         );
-        assert!(table.columns.len() == table[0].len());
+        assert!(table.get_columns().len() == table[0].len());
         let expected_columns_in_order = vec![
             ColumnDefinition {
                 name: "id".to_string(),
@@ -197,4 +200,75 @@ mod tests {
         ];
         assert_eq!(expected_rows, table.get_rows_clone());
     }
+
+    #[test]
+    fn alter_table_rename_column_works_correctly_with_transaction() {
+        let mut database = default_database();
+        let statement = AlterTableStatement {
+            table_name: "users".to_string(),
+            action: AlterTableAction::RenameColumn {
+                old_column_name: "name".to_string(),
+                new_column_name: "new_name".to_string(),
+            },
+        };
+        let result = alter_table(&mut database, statement, true);
+        assert!(result.is_ok());
+        let table = database.get_table("users");
+        assert!(table.is_ok());
+        let table = table.unwrap();
+        assert!(
+            table
+                .get_columns()
+                .iter()
+                .any(|column| column.name == "new_name")
+        );
+        let index_of_column = table.get_index_of_column(&"new_name".to_string()).unwrap();
+        assert!(table.columns.stack.len() == 2);
+        assert!(table.columns.stack[0][index_of_column].name == "name");
+        assert!(table.columns.stack[1][index_of_column].name == "new_name");
+    }
+
+    #[test]
+    fn alter_table_drop_column_works_correctly_with_transaction() {
+        let mut database = default_database();
+        let statement = AlterTableStatement {
+            table_name: "users".to_string(),
+            action: AlterTableAction::DropColumn {
+                column_name: "age".to_string(),
+            },
+        };
+        let result = alter_table(&mut database, statement, true);
+        assert!(result.is_ok());
+        let table = database.get_table("users");
+        assert!(table.is_ok());
+        let table = table.unwrap();
+        assert!(
+            !table
+                .get_columns()
+                .iter()
+                .any(|column| column.name == "age")
+        );
+        assert!(table.columns.stack.len() == 2);
+        let expected_column_names = vec![
+            vec![
+                "id".to_string(),
+                "name".to_string(),
+                "age".to_string(),
+                "money".to_string(),
+            ],
+            vec!["id".to_string(), "name".to_string(), "money".to_string()],
+        ];
+        assert_eq!(
+            expected_column_names,
+            table
+                .columns
+                .stack
+                .iter()
+                .map(|column| column
+                    .iter()
+                    .map(|column| column.name.clone())
+                    .collect::<Vec<String>>())
+                .collect::<Vec<Vec<String>>>()
+        );
+    }
 }
diff --git a/src/db/table/helpers/common.rs b/src/db/table/helpers/common.rs
index a3712b6..b288781 100644
--- a/src/db/table/helpers/common.rs
+++ b/src/db/table/helpers/common.rs
@@ -43,7 +43,7 @@ pub fn get_columns_from_row(
         } else {
             return Err(format!(
                 "Row does not have the expected number of columns (expected: {}, got: {}",
-                table.columns.len(),
+                table.get_columns().len(),
                 row.len()
             ));
         }
diff --git a/src/db/table/mod.rs b/src/db/table/mod.rs
index e463835..8d80ca5 100644
--- a/src/db/table/mod.rs
+++ b/src/db/table/mod.rs
@@ -184,21 +184,107 @@ pub struct ColumnConstraint {
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct ColumnStack {
-    pub stack: Vec<ColumnDefinition>,
+    pub stack: Vec<Vec<ColumnDefinition>>,
 }
 
 impl ColumnStack {
-    pub fn new(column: ColumnDefinition) -> Self {
+    pub fn new(columns: Vec<ColumnDefinition>) -> Self {
         Self {
-            stack: vec![column],
+            stack: vec![columns],
         }
     }
+
+    fn append_clone(&mut self) -> Result<(), String> {
+        self.stack.push(self.peek()?.clone());
+        Ok(())
+    }
+
+    pub fn push_column(&mut self, column: ColumnDefinition, is_transaction: bool) {
+        if is_transaction {
+            self.stack.push(self.stack.last().unwrap().clone());
+        }
+        self.stack.last_mut().unwrap().push(column);
+    }
+
+    pub fn rename_column(
+        &mut self,
+        old_column_name: &String,
+        new_column_name: &String,
+        table_name: &String,
+        is_transaction: bool,
+    ) -> Result<(), String> {
+        if is_transaction {
+            self.append_clone()?;
+        }
+        let columns = self
+            .peek_mut()?
+            .iter_mut()
+            .find(|column| column.name == *old_column_name);
+        match columns {
+            Some(column) => column.name = new_column_name.clone(),
+            None => {
+                return Err(format!(
+                    "Column `{}` does not exist in table `{}`",
+                    old_column_name, table_name
+                ));
+            }
+        }
+        Ok(())
+    }
+
+    pub fn drop_column(
+        &mut self,
+        column_name: &String,
+        table_name: &String,
+        is_transaction: bool,
+    ) -> Result<(), String> {
+        if is_transaction {
+            self.append_clone()?;
+        }
+        match self.get_index_of_column(column_name) {
+            Ok(index) => self.peek_mut()?.remove(index),
+            Err(_) => {
+                return Err(format!(
+                    "Column `{}` does not exist in table `{}`",
+                    column_name, table_name
+                ));
+            }
+        };
+        Ok(())
+    }
+
+    pub fn get_index_of_column(&self, column_name: &String) -> Result<usize, String> {
+        let columns = self.peek();
+        match columns {
+            Ok(columns) => {
+                if let Some(index) = columns
+                    .iter()
+                    .position(|column| column.name == *column_name)
+                {
+                    Ok(index)
+                } else {
+                    Err(format!("Column `{}` does not exist", column_name))
+                }
+            }
+            Err(_) => Err("Column stack is empty".to_string()),
+        }
+    }
+
+    fn peek(&self) -> Result<&Vec<ColumnDefinition>, String> {
+        self.stack.last().ok_or("Column stack is empty".to_string())
+    }
+
+    fn peek_mut(&mut self) -> Result<&mut Vec<ColumnDefinition>, String> {
+        self.stack
+            .last_mut()
+            .ok_or("Column stack is empty".to_string())
+    }
 }
 
 #[derive(Debug)]
 pub struct Table {
     pub name: String,
-    columns: Vec<ColumnStack>,
+    columns: ColumnStack,
     rows: Vec<RowStack>,
 }
 
@@ -220,7 +306,7 @@ impl Table {
     pub fn new(name: String, columns: Vec<ColumnDefinition>) -> Self {
         Self {
             name,
-            columns: columns.into_iter().map(|c| ColumnStack::new(c)).collect(),
+            columns: ColumnStack::new(columns),
             rows: vec![],
         }
     }
@@ -305,7 +391,7 @@ impl Table {
     }
 
     fn width(&self) -> usize {
-        self.columns.len()
+        self.get_columns().len()
     }
 
     pub fn get_index_of_column(&self, column: &String) -> Result<usize, String> {
@@ -321,17 +407,11 @@ impl Table {
     }
 
     pub fn get_columns(&self) -> Vec<&ColumnDefinition> {
-        self.columns
-            .iter()
-            .map(|c| c.stack.last().unwrap())
-            .collect()
+        self.columns.stack.last().unwrap().iter().collect()
     }
 
     pub fn get_columns_mut(&mut self) -> Vec<&mut ColumnDefinition> {
-        self.columns
-            .iter_mut()
-            .map(|c| c.stack.last_mut().unwrap())
-            .collect()
+        self.columns.stack.last_mut().unwrap().iter_mut().collect()
     }
 
     pub fn get_column_names(&self) -> Vec<&String> {
@@ -342,7 +422,7 @@ impl Table {
     }
 
     pub fn push_column(&mut self, column: ColumnDefinition) {
-        self.columns.push(ColumnStack::new(column));
+        self.columns.push_column(column, false);
     }
 
     #[cfg(test)]
diff --git a/src/db/table/select/select_statement.rs b/src/db/table/select/select_statement.rs
index 9c5cf63..c74738a 100644
--- a/src/db/table/select/select_statement.rs
+++ b/src/db/table/select/select_statement.rs
@@ -327,18 +327,18 @@ mod tests {
     fn select_with_distinct_mode_is_generated_correctly() {
         let mut table = Table {
             name: "users".to_string(),
-            columns: vec![
-                ColumnStack::new(ColumnDefinition {
+            columns: ColumnStack::new(vec![
+                ColumnDefinition {
                     name: "id".to_string(),
                     data_type: DataType::Integer,
                     constraints: vec![],
-                }),
-                ColumnStack::new(ColumnDefinition {
+                },
+                ColumnDefinition {
                     name: "name".to_string(),
                     data_type: DataType::Text,
                     constraints: vec![],
-                }),
-            ],
+                },
+            ]),
             rows: vec![],
         };
         table.set_rows(vec![
diff --git a/src/db/table/test_utils.rs b/src/db/table/test_utils.rs
index 8213ae3..d2c8a98 100644
--- a/src/db/table/test_utils.rs
+++ b/src/db/table/test_utils.rs
@@ -13,30 +13,28 @@ use std::cmp::Ordering;
 pub fn default_table() -> Table {
     Table {
         name: "users".to_string(),
-        columns: vec![
-            ColumnStack::new({
-                ColumnDefinition {
-                    name: "id".to_string(),
-                    data_type: DataType::Integer,
-                    constraints: vec![],
-                }
-            }),
-            ColumnStack::new(ColumnDefinition {
+        columns: ColumnStack::new(vec![
+            ColumnDefinition {
+                name: "id".to_string(),
+                data_type: DataType::Integer,
+                constraints: vec![],
+            },
+            ColumnDefinition {
                 name: "name".to_string(),
                 data_type: DataType::Text,
                 constraints: vec![],
-            }),
-            ColumnStack::new(ColumnDefinition {
+            },
+            ColumnDefinition {
                 name: "age".to_string(),
                 data_type: DataType::Integer,
                 constraints: vec![],
-            }),
-            ColumnStack::new(ColumnDefinition {
+            },
+            ColumnDefinition {
                 name: "money".to_string(),
                 data_type: DataType::Real,
                 constraints: vec![],
-            }),
-        ],
+            },
+        ]),
         rows: vec![
             RowStack::new(Row(vec![
                 Value::Integer(1),
@@ -73,28 +71,28 @@ pub fn default_database() -> Database {
         "users".to_string(),
         Table {
             name: "users".to_string(),
-            columns: vec![
-                ColumnStack::new(ColumnDefinition {
+            columns: ColumnStack::new(vec![
+                ColumnDefinition {
                     name: "id".to_string(),
                     data_type: DataType::Integer,
                     constraints: vec![],
-                }),
-                ColumnStack::new(ColumnDefinition {
+                },
+                ColumnDefinition {
                     name: "name".to_string(),
                     data_type: DataType::Text,
                     constraints: vec![],
-                }),
-                ColumnStack::new(ColumnDefinition {
+                },
+                ColumnDefinition {
                     name: "age".to_string(),
                     data_type: DataType::Integer,
                     constraints: vec![],
-                }),
-                ColumnStack::new(ColumnDefinition {
+                },
+                ColumnDefinition {
                     name: "money".to_string(),
                     data_type: DataType::Real,
                     constraints: vec![],
-                }),
-            ],
+                },
+            ]),
             rows: vec![
                 RowStack::new(Row(vec![
                     Value::Integer(1),