diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua
index 2ddbb63..d109537 100644
--- a/.config/nvim/lua/plugins/lazy.lua
+++ b/.config/nvim/lua/plugins/lazy.lua
@@ -37,6 +37,12 @@ lazy.setup({
     'tpope/vim-obsession',
     'tpope/vim-fugitive',
 
+    --Database integration
+    'tpope/vim-dadbod',
+    'kristijanhusak/vim-dadbod-ui',
+
+    'mbbill/undotree',
+
     --Tmux navigation
     {
         'alexghergh/nvim-tmux-navigation',
diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua
index adbdb96..d181241 100644
--- a/.config/nvim/lua/plugins/null-ls.lua
+++ b/.config/nvim/lua/plugins/null-ls.lua
@@ -1,13 +1,16 @@
 local null_ls = require("null-ls")
 
 null_ls.setup({
-	sources = {
-		null_ls.builtins.formatting.rustfmt,
+    sources = {
+        null_ls.builtins.formatting.rustfmt,
         null_ls.builtins.formatting.stylish_haskell,
         null_ls.builtins.formatting.fourmolu,
         null_ls.builtins.formatting.blue,
-		null_ls.builtins.formatting.prettierd.with({
-			filetypes = { "html", "json", "yaml", "markdown" },
-		}),
-	}
+        null_ls.builtins.formatting.sql_formatter.with({
+            extra_args = { "--config", "/home/afonso/.config/nvim/lua/plugins/sql_formatter.json"}
+        }),
+        null_ls.builtins.formatting.prettierd.with({
+            filetypes = { "html", "json", "yaml", "markdown" },
+        }),
+    }
 })
diff --git a/.config/nvim/lua/plugins/sql_formatter.json b/.config/nvim/lua/plugins/sql_formatter.json
new file mode 100644
index 0000000..f725b10
--- /dev/null
+++ b/.config/nvim/lua/plugins/sql_formatter.json
@@ -0,0 +1,3 @@
+{
+    "keywordCase": "upper"
+}