* BUG: Connections are now always searched in the main project archive.


git-svn-id: svn://localhost/gambas/trunk@7347 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2015-09-26 08:45:31 +00:00
parent 647c900268
commit 966385aaa5
3 changed files with 7 additions and 7 deletions

View file

@ -1,3 +1,3 @@
[Component]
Key=gb.db
Version=3.8.0
Version=3.8.90

View file

@ -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

View file

@ -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