From fd21a2ecb7f098431c61fd86109abc8977292013 Mon Sep 17 00:00:00 2001
From: Muneeb Usmani <muneebusmani8355@gmail.com>
Date: Sun, 2 Jun 2024 17:43:19 +0500
Subject: [PATCH 1/3] Added Database Support with dadbod ui

---
 lua/lazyvim/plugins/extras/util/database.lua | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lua/lazyvim/plugins/extras/util/database.lua

diff --git a/lua/lazyvim/plugins/extras/util/database.lua b/lua/lazyvim/plugins/extras/util/database.lua
new file mode 100644
index 00000000..f9ce0749
--- /dev/null
+++ b/lua/lazyvim/plugins/extras/util/database.lua
@@ -0,0 +1,27 @@
+return {
+  "kristijanhusak/vim-dadbod-ui",
+  dependencies = {
+    { "tpope/vim-dadbod", lazy = true },
+    { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
+  },
+  cmd = {
+    "DBUI",
+    "DBUIToggle",
+    "DBUIAddConnection",
+    "DBUIFindBuffer",
+  },
+  init = function()
+    local wk = require("which-key")
+    local wkopts = function(keymaps, description)
+      return { keymaps, description, noremap = true, silent = true }
+    end
+    wk.register({
+      d = {
+        name = "Database UI",
+        e = wkopts("<cmd>DBUI<CR>", "Database Explorer"),
+        a = wkopts("<cmd>DBUIAddConnection<CR>", "Add Database Connection"),
+      },
+    }, { prefix = "<leader>" })
+    vim.g.db_ui_use_nerd_fonts = 1
+  end,
+}

From 9fea761adc77fb6fb1a6274cc37949f822f62bc2 Mon Sep 17 00:00:00 2001
From: Muneeb Usmani <muneebusmani8355@gmail.com>
Date: Sun, 2 Jun 2024 18:04:45 +0500
Subject: [PATCH 2/3] integrated dadbod ui into edgy.nvim

---
 lua/lazyvim/plugins/extras/util/database.lua | 71 +++++++++++++-------
 1 file changed, 47 insertions(+), 24 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/database.lua b/lua/lazyvim/plugins/extras/util/database.lua
index f9ce0749..131b16e5 100644
--- a/lua/lazyvim/plugins/extras/util/database.lua
+++ b/lua/lazyvim/plugins/extras/util/database.lua
@@ -1,27 +1,50 @@
 return {
-  "kristijanhusak/vim-dadbod-ui",
-  dependencies = {
-    { "tpope/vim-dadbod", lazy = true },
-    { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
-  },
-  cmd = {
-    "DBUI",
-    "DBUIToggle",
-    "DBUIAddConnection",
-    "DBUIFindBuffer",
-  },
-  init = function()
-    local wk = require("which-key")
-    local wkopts = function(keymaps, description)
-      return { keymaps, description, noremap = true, silent = true }
-    end
-    wk.register({
-      d = {
-        name = "Database UI",
-        e = wkopts("<cmd>DBUI<CR>", "Database Explorer"),
-        a = wkopts("<cmd>DBUIAddConnection<CR>", "Add Database Connection"),
+  {
+    "folke/edgy.nvim",
+    event = "VeryLazy",
+    init = function()
+      vim.opt.laststatus = 3
+      vim.opt.splitkeep = "screen"
+    end,
+    opts = {
+      right = {
+        {
+          ft = "dbui",
+          pinned = true,
+          open = "DBUI",
+        },
       },
-    }, { prefix = "<leader>" })
-    vim.g.db_ui_use_nerd_fonts = 1
-  end,
+      options = {
+        right = { size = 40 },
+      },
+    },
+  },
+
+  {
+    "kristijanhusak/vim-dadbod-ui",
+    dependencies = {
+      { "tpope/vim-dadbod", lazy = true },
+      { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
+    },
+    cmd = {
+      "DBUI",
+      "DBUIToggle",
+      "DBUIAddConnection",
+      "DBUIFindBuffer",
+    },
+    init = function()
+      local wk = require("which-key")
+      local wkopts = function(keymaps, description)
+        return { keymaps, description, noremap = true, silent = true }
+      end
+      wk.register({
+        uD = {
+          name = "Database UI",
+          e = wkopts("<cmd>DBUI<CR>", "Database Explorer"),
+          a = wkopts("<cmd>DBUIAddConnection<CR>", "Add Database Connection"),
+        },
+      }, { prefix = "<leader>" })
+      vim.g.db_ui_use_nerd_fonts = 1
+    end,
+  },
 }

From 8d14085838f45c3f0ff35ea66c586582d66c0756 Mon Sep 17 00:00:00 2001
From: Muneeb Usmani <muneebusmani8355@gmail.com>
Date: Sun, 2 Jun 2024 20:11:56 +0500
Subject: [PATCH 3/3] optimized ui for database integration

---
 lua/lazyvim/plugins/extras/util/database.lua | 35 ++++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/util/database.lua b/lua/lazyvim/plugins/extras/util/database.lua
index 131b16e5..293397a7 100644
--- a/lua/lazyvim/plugins/extras/util/database.lua
+++ b/lua/lazyvim/plugins/extras/util/database.lua
@@ -6,18 +6,15 @@ return {
       vim.opt.laststatus = 3
       vim.opt.splitkeep = "screen"
     end,
-    opts = {
-      right = {
-        {
-          ft = "dbui",
-          pinned = true,
-          open = "DBUI",
-        },
-      },
-      options = {
-        right = { size = 40 },
-      },
-    },
+    opts = function(_, opts)
+      table.insert(opts.right, {
+        title = "Database",
+        ft = "dbui",
+        pinned = true,
+        open = "DBUI",
+        size = { width = 0.25 },
+      })
+    end,
   },
 
   {
@@ -27,21 +24,23 @@ return {
       { "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
     },
     cmd = {
-      "DBUI",
       "DBUIToggle",
       "DBUIAddConnection",
-      "DBUIFindBuffer",
     },
     init = function()
       local wk = require("which-key")
-      local wkopts = function(keymaps, description)
-        return { keymaps, description, noremap = true, silent = true }
+      local dbtoggle = function()
+        if _G.LazyVim.is_loaded("vim-dadbod-ui") then
+          return { "<cmd>DBUIToggle<CR>", "Database Explorer", silent = true }
+        else
+          return { "<cmd>Lazy load vim-dadbod-ui | DBUIToggle<CR>", "Database Explorer", silent = true }
+        end
       end
       wk.register({
         uD = {
           name = "Database UI",
-          e = wkopts("<cmd>DBUI<CR>", "Database Explorer"),
-          a = wkopts("<cmd>DBUIAddConnection<CR>", "Add Database Connection"),
+          e = dbtoggle(),
+          a = { "<cmd>DBUIAddConnection<CR>", "Add Database Connection", silent = true },
         },
       }, { prefix = "<leader>" })
       vim.g.db_ui_use_nerd_fonts = 1