From 966385aaa5e1b68796935f1a793a13afcfc8d4b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 26 Sep 2015 08:45:31 +0000 Subject: [PATCH] [GB.DB] * BUG: Connections are now always searched in the main project archive. git-svn-id: svn://localhost/gambas/trunk@7347 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- main/lib/db/gb.db/.component | 2 +- main/lib/db/gb.db/.project | 4 ++-- main/lib/db/gb.db/.src/Connections.class | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main/lib/db/gb.db/.component b/main/lib/db/gb.db/.component index 6633ebe81..c06e5459f 100644 --- a/main/lib/db/gb.db/.component +++ b/main/lib/db/gb.db/.component @@ -1,3 +1,3 @@ [Component] Key=gb.db -Version=3.8.0 +Version=3.8.90 diff --git a/main/lib/db/gb.db/.project b/main/lib/db/gb.db/.project index 8abf7c099..f2a233ed7 100644 --- a/main/lib/db/gb.db/.project +++ b/main/lib/db/gb.db/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.8.0 +# Compiled with Gambas 3.8.90 Title=gb.db Startup=Main -Version=3.8.0 +Version=3.8.90 VersionFile=1 Component=gb.db TabSize=2 diff --git a/main/lib/db/gb.db/.src/Connections.class b/main/lib/db/gb.db/.src/Connections.class index 9ea290661..28b2fa3a0 100644 --- a/main/lib/db/gb.db/.src/Connections.class +++ b/main/lib/db/gb.db/.src/Connections.class @@ -13,7 +13,7 @@ Static Private $sKey As String Static Public Sub Exist(Name As String) As Boolean - If $cConn.Exist(Name) Or If Exist("../.connection" &/ Name & ".connection") Then Return True + If $cConn.Exist(Name) Or If Exist(".../.connection" &/ Name & ".connection") Then Return True End @@ -24,7 +24,7 @@ Static Private Sub Init() If $aConn Then Return $aConn = New String[] - For Each sFile In Dir("../.connection", "*.connection") + For Each sFile In Dir(".../.connection", "*.connection") $aConn.Add(File.BaseName(sFile)) Next @@ -39,7 +39,7 @@ Static Private Sub ReadConnectionFile(sName As String) As Collection Dim bInConnection As Boolean Dim aLine As String[] - sPath = "../.connection" &/ sName & ".connection" + sPath = ".../.connection" &/ sName & ".connection" If Not Exist(sPath) Then Return hFile = Open sPath @@ -178,7 +178,7 @@ Static Public Sub Create(Name As String) As Connection hConn = GetConnectionFrom(Name, cData) - sPath = "../.connection" &/ Name & ".template" + sPath = ".../.connection" &/ Name & ".template" If Exist(sPath) Then hConnDB = New Connection