From a23e376fa7da7b96b5567b7936bbdc5c392148c8 Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Fri, 28 Nov 2014 01:10:38 +0000
Subject: Update listdatabases view to handle sqlite where you cannot list
 databases

---
 lib/db-listdatabases-html.lsp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/db-listdatabases-html.lsp b/lib/db-listdatabases-html.lsp
index 525a2b0..908d42b 100644
--- a/lib/db-listdatabases-html.lsp
+++ b/lib/db-listdatabases-html.lsp
@@ -1,6 +1,7 @@
 <% local form, viewlibrary, page_info, session = ... %>
 <% htmlviewfunctions = require("htmlviewfunctions") %>
 <% html = require("acf.html") %>
+<% db = require("acf.db") %>
 
 <% if form.value.databases and #form.value.databases.value>0 then %>
 <script type="text/javascript">
@@ -23,8 +24,10 @@
 <% end %>
 
 <% local header_level = htmlviewfunctions.displaysectionstart(form, page_info) %>
+<% local database %>
 <% if form.value.connection then
 	-- hide the database, since we don't need it to list databases
+	database = form.value.connection.value.database
 	form.value.connection.value.database = nil
 end %>
 <% if form.value.connection and ( next(form.value.connection.value) ~= nil or form.value.connection.errtxt ) then
@@ -33,21 +36,21 @@ end %>
 	form.option = "Update"
 	htmlviewfunctions.displayformend(form, htmlviewfunctions.incrementheader(header_level))
 end %>
-<% if form.value.databases and #form.value.databases.value>0 then %>
-<table id="listdatabases" class="tablesorter"><thead>
-        <tr>
-		<th>Action</th>
-		<th>Database</th>
-	</tr>
-</thead><tbody>
 <% -- We need to pass the connection key values to listtables
 local formvalues = {}
 if form.value.connection then
 	formvalues.connection = form.value.connection
+	form.value.connection.value.database = database
 	for n,v in pairs(form.value.connection.value) do v.type="hidden" end
 end
-form.value.connection.value.database = cfe({ type="hidden" })
 %>
+<% if form.value.databases and #form.value.databases.value>0 then %>
+<table id="listdatabases" class="tablesorter"><thead>
+        <tr>
+		<th>Action</th>
+		<th>Database</th>
+	</tr>
+</thead><tbody>
 <% for i,dbase in ipairs(form.value.databases.value) do %>
 	<% formvalues.connection.value.database.value = dbase %>
 	<tr>
@@ -60,7 +63,11 @@ form.value.connection.value.database = cfe({ type="hidden" })
 	</tr>
 <% end %>
 </tbody></table>
-<% else %>
+<% elseif form.value.connection and form.value.connection.value.engine and tonumber(form.value.connection.value.engine.value) and tonumber(form.value.connection.value.engine.value) == db.engine.sqlite3 then
+	form.value.connection.label = "Database"
+	form.value.connection.value.database.type = "text"
+	htmlviewfunctions.displayitem(cfe({type="link", value=formvalues, label="", option="View", action="listtables"}), page_info, header_level)
+else %>
 <p>No databases found</p>
 <% end %>
 <% htmlviewfunctions.displaysectionend(header_level) %>
-- 
cgit v1.2.3