luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GB.DB]

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/lib/db/gb.db/.component
View file

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

4
main/lib/db/gb.db/.project
View file

@ -1,8 +1,8 @@
# Gambas Project File 3.0 # Gambas Project File 3.0
# Compiled with Gambas 3.8.0 # Compiled with Gambas 3.8.90
Title=gb.db Title=gb.db
Startup=Main Startup=Main
Version=3.8.0 Version=3.8.90
VersionFile=1 VersionFile=1
Component=gb.db Component=gb.db
TabSize=2 TabSize=2

8
main/lib/db/gb.db/.src/Connections.class
View file

@ -13,7 +13,7 @@ Static Private $sKey As String
Static Public Sub Exist(Name As String) As Boolean 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 End
@ -24,7 +24,7 @@ Static Private Sub Init()
If $aConn Then Return If $aConn Then Return
$aConn = New String[] $aConn = New String[]
For Each sFile In Dir("../.connection", "*.connection") For Each sFile In Dir(".../.connection", "*.connection")
$aConn.Add(File.BaseName(sFile)) $aConn.Add(File.BaseName(sFile))
Next Next
@ -39,7 +39,7 @@ Static Private Sub ReadConnectionFile(sName As String) As Collection
Dim bInConnection As Boolean Dim bInConnection As Boolean
Dim aLine As String[] Dim aLine As String[]
sPath = "../.connection" &/ sName & ".connection" sPath = ".../.connection" &/ sName & ".connection"
If Not Exist(sPath) Then Return If Not Exist(sPath) Then Return
hFile = Open sPath hFile = Open sPath
@ -178,7 +178,7 @@ Static Public Sub Create(Name As String) As Connection
hConn = GetConnectionFrom(Name, cData) hConn = GetConnectionFrom(Name, cData)
sPath = "../.connection" &/ Name & ".template" sPath = ".../.connection" &/ Name & ".template"
If Exist(sPath) Then If Exist(sPath) Then
hConnDB = New Connection hConnDB = New Connection