Merge pull request #5770 from livecodemichael/bugfix-20013

livecodepanos · web-flow · commit 9d7fbfc35e20 · 2017-09-19T17:32:50.000+01:00
[[ Bug 20013 ]] RevDB database types should be case insensitive.
diff --git a/docs/notes/bugfix-20013.md b/docs/notes/bugfix-20013.md
@@ -0,0 +1 @@
+# Database type passed to revOpenDatabase should be case insensitive
diff --git a/revdb/src/revdb.cpp b/revdb/src/revdb.cpp
@@ -291,26 +291,30 @@ DATABASEREC *LoadDatabaseDriver(const char *p_type)
 {
     DATABASEREC *t_database_rec = nullptr;
     
+    char t_type[32];
+    strcpy(t_type, p_type);
+    strlwr(t_type);
+
     if (revdbdriverpaths != nullptr)
     {
         t_database_rec = LoadDatabaseDriverInFolder(revdbdriverpaths, p_type);
     }
     else
     {
-        t_database_rec = LoadDatabaseDriverInFolder(".", p_type);
+        t_database_rec = LoadDatabaseDriverInFolder(".", t_type);
         
         
         if (t_database_rec == nullptr)
             t_database_rec = LoadDatabaseDriverInFolder("./Database Drivers",
-                                                        p_type);
+                                                        t_type);
 
         if (t_database_rec == nullptr)
             t_database_rec = LoadDatabaseDriverInFolder("./database_drivers",
-                                                        p_type);
+                                                        t_type);
 
         if (t_database_rec == nullptr)
             t_database_rec = LoadDatabaseDriverInFolder("./drivers",
-                                                        p_type);
+                                                        t_type);
     }
     
     if (t_database_rec != nullptr)
diff --git a/tests/lcs/core/database/case-senstive-db-type.livecodescript b/tests/lcs/core/database/case-senstive-db-type.livecodescript
@@ -0,0 +1,43 @@
+﻿script "case-senstive-db-type"
+/*
+Copyright (C) 2017 LiveCode Ltd.
+
+This file is part of LiveCode.
+
+LiveCode is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License v3 as published by the Free
+Software Foundation.
+
+LiveCode is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
+
+local sDBDir
+
+on TestSetup
+   TestSkipIfNot "database", "sqlite"   
+   TestLoadExternal "revdb"
+   
+   put TestGetEngineRepositoryPath() & "/_tests/_build/case-sensitive-db-type" into sDBDir
+   create directory sDBDir
+end TestSetup
+
+on TestTeardown
+   delete directory sDBDir
+end TestTeardown
+
+on TestOpenDBWithMixedCaseForType
+   local tDBpath, tConnectionID
+   
+   put sDBDir & "/test1-sqlite.db" into tDBPath   
+   put revOpenDatabase("sqlite", tDBPath) into tConnectionID
+   TestAssert "open database of type sqlite" && tConnectionID, tConnectionID is an integer
+   
+   put sDBDir & "/test2-SQLite.db" into tDBPath   
+   put revOpenDatabase("SQLite", tDBPath) into tConnectionID
+   TestAssert "open database of type SQLite" && tConnectionID, tConnectionID is an integer   
+end TestOpenDBWithMixedCaseForType

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Database type passed to revOpenDatabase should be case insensitive`
Original file line number	Diff line number	Diff line change
`@@ -291,26 +291,30 @@ DATABASEREC LoadDatabaseDriver(const char p_type)`
`291`	`291`	`{`
`292`	`292`	`DATABASEREC *t_database_rec = nullptr;`
`293`	`293`
	`294`	`+ char t_type[32];`
	`295`	`+ strcpy(t_type, p_type);`
	`296`	`+ strlwr(t_type);`
	`297`	`+`
`294`	`298`	`if (revdbdriverpaths != nullptr)`
`295`	`299`	`{`
`296`	`300`	`t_database_rec = LoadDatabaseDriverInFolder(revdbdriverpaths, p_type);`
`297`	`301`	`}`
`298`	`302`	`else`
`299`	`303`	`{`
`300`		`- t_database_rec = LoadDatabaseDriverInFolder(".", p_type);`
	`304`	`+ t_database_rec = LoadDatabaseDriverInFolder(".", t_type);`
`301`	`305`
`302`	`306`
`303`	`307`	`if (t_database_rec == nullptr)`
`304`	`308`	`t_database_rec = LoadDatabaseDriverInFolder("./Database Drivers",`
`305`		`- p_type);`
	`309`	`+ t_type);`
`306`	`310`
`307`	`311`	`if (t_database_rec == nullptr)`
`308`	`312`	`t_database_rec = LoadDatabaseDriverInFolder("./database_drivers",`
`309`		`- p_type);`
	`313`	`+ t_type);`
`310`	`314`
`311`	`315`	`if (t_database_rec == nullptr)`
`312`	`316`	`t_database_rec = LoadDatabaseDriverInFolder("./drivers",`
`313`		`- p_type);`
	`317`	`+ t_type);`
`314`	`318`	`}`
`315`	`319`
`316`	`320`	`if (t_database_rec != nullptr)`