Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
99dfc263
Kaydet (Commit)
99dfc263
authored
Tem 08, 2013
tarafından
Andrzej J.R. Hunt
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Add embedded firebird loading code, set as default db.
Change-Id: I993d7d7bacec710bb57d9e8f91d3cd01b0fbf616
üst
002e9c5a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
FDriver.cxx
connectivity/source/drivers/firebird/FDriver.cxx
+4
-1
dsntypes.cxx
dbaccess/source/core/misc/dsntypes.cxx
+9
-0
dsntypes.hxx
dbaccess/source/inc/dsntypes.hxx
+1
-0
generalpage.cxx
dbaccess/source/ui/dlg/generalpage.cxx
+2
-1
No files found.
connectivity/source/drivers/firebird/FDriver.cxx
Dosyayı görüntüle @
99dfc263
...
@@ -147,7 +147,10 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const ::rtl::OUString& url )
...
@@ -147,7 +147,10 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const ::rtl::OUString& url )
{
{
// here we have to look if we support this url format
// here we have to look if we support this url format
// change the URL format to your needs, but please aware that the first on who accepts the URl wins.
// change the URL format to your needs, but please aware that the first on who accepts the URl wins.
return
url
.
startsWith
(
"sdbc:firebird:"
);
// This could be extended to allow for external dbs using e.g. sdbc:firebird:url
// in addition to embedded dbs.
// return url.startsWith("sdbc:firebird:");
return
url
.
equals
(
"sdbc:embedded:firebird"
);
}
}
// --------------------------------------------------------------------------------
// --------------------------------------------------------------------------------
Sequence
<
DriverPropertyInfo
>
SAL_CALL
FirebirdDriver
::
getPropertyInfo
(
const
::
rtl
::
OUString
&
url
,
const
Sequence
<
PropertyValue
>&
info
)
throw
(
SQLException
,
RuntimeException
)
Sequence
<
DriverPropertyInfo
>
SAL_CALL
FirebirdDriver
::
getPropertyInfo
(
const
::
rtl
::
OUString
&
url
,
const
Sequence
<
PropertyValue
>&
info
)
throw
(
SQLException
,
RuntimeException
)
...
...
dbaccess/source/core/misc/dsntypes.cxx
Dosyayı görüntüle @
99dfc263
...
@@ -206,6 +206,7 @@ OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _s
...
@@ -206,6 +206,7 @@ OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _s
bool
ODsnTypeCollection
::
isShowPropertiesEnabled
(
const
OUString
&
_sURL
)
const
bool
ODsnTypeCollection
::
isShowPropertiesEnabled
(
const
OUString
&
_sURL
)
const
{
{
return
!
(
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:embedded:hsqldb"
,
sizeof
(
"sdbc:embedded:hsqldb"
)
-
1
)
return
!
(
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:embedded:hsqldb"
,
sizeof
(
"sdbc:embedded:hsqldb"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:embedded:firebird"
,
sizeof
(
"sdbc:embedded:firebird"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:outlook"
,
sizeof
(
"sdbc:address:outlook"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:outlook"
,
sizeof
(
"sdbc:address:outlook"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:outlookexp"
,
sizeof
(
"sdbc:address:outlookexp"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:outlookexp"
,
sizeof
(
"sdbc:address:outlookexp"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:mozilla:"
,
sizeof
(
"sdbc:address:mozilla:"
)
-
1
)
||
_sURL
.
matchIgnoreAsciiCaseAsciiL
(
"sdbc:address:mozilla:"
,
sizeof
(
"sdbc:address:mozilla:"
)
-
1
)
...
@@ -321,7 +322,11 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const
...
@@ -321,7 +322,11 @@ OUString ODsnTypeCollection::getEmbeddedDatabase() const
}
}
}
}
if
(
sEmbeddedDatabaseURL
.
isEmpty
()
)
if
(
sEmbeddedDatabaseURL
.
isEmpty
()
)
#ifdef ENABLE_FIREBIRD_SDBC
sEmbeddedDatabaseURL
=
"sdbc:embedded:firebird"
;
#else
sEmbeddedDatabaseURL
=
"sdbc:embedded:hsqldb"
;
sEmbeddedDatabaseURL
=
"sdbc:embedded:hsqldb"
;
#endif
return
sEmbeddedDatabaseURL
;
return
sEmbeddedDatabaseURL
;
}
}
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
...
@@ -361,6 +366,9 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
...
@@ -361,6 +366,9 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const
if
(
sDsn
.
equalsIgnoreAsciiCase
(
"sdbc:embedded:hsqldb"
))
if
(
sDsn
.
equalsIgnoreAsciiCase
(
"sdbc:embedded:hsqldb"
))
return
DST_EMBEDDED_HSQLDB
;
return
DST_EMBEDDED_HSQLDB
;
if
(
sDsn
.
equalsIgnoreAsciiCase
(
"sdbc:embedded:firebird"
))
return
DST_EMBEDDED_FIREBIRD
;
// find second :
// find second :
nSeparator
=
sDsn
.
indexOf
(
static_cast
<
sal_Unicode
>
(
':'
),
nSeparator
+
1
);
nSeparator
=
sDsn
.
indexOf
(
static_cast
<
sal_Unicode
>
(
':'
),
nSeparator
+
1
);
if
(
-
1
==
nSeparator
)
if
(
-
1
==
nSeparator
)
...
@@ -489,6 +497,7 @@ void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int
...
@@ -489,6 +497,7 @@ void ODsnTypeCollection::fillPageIds(const OUString& _sURL,::std::vector<sal_Int
case
DST_KAB
:
case
DST_KAB
:
case
DST_MACAB
:
case
DST_MACAB
:
case
DST_EMBEDDED_HSQLDB
:
case
DST_EMBEDDED_HSQLDB
:
case
DST_EMBEDDED_FIREBIRD
:
break
;
break
;
default
:
default
:
_rOutPathIds
.
push_back
(
PAGE_DBSETUPWIZARD_USERDEFINED
);
_rOutPathIds
.
push_back
(
PAGE_DBSETUPWIZARD_USERDEFINED
);
...
...
dbaccess/source/inc/dsntypes.hxx
Dosyayı görüntüle @
99dfc263
...
@@ -61,6 +61,7 @@ enum DATASOURCE_TYPE
...
@@ -61,6 +61,7 @@ enum DATASOURCE_TYPE
DST_EMBEDDED_HSQLDB
=
23
,
DST_EMBEDDED_HSQLDB
=
23
,
DST_MYSQL_NATIVE
=
24
,
DST_MYSQL_NATIVE
=
24
,
DST_MYSQL_NATIVE_DIRECT
=
25
,
DST_MYSQL_NATIVE_DIRECT
=
25
,
DST_EMBEDDED_FIREBIRD
=
26
,
DST_USERDEFINE1
,
/// first user defined driver
DST_USERDEFINE1
,
/// first user defined driver
DST_USERDEFINE2
,
DST_USERDEFINE2
,
...
...
dbaccess/source/ui/dlg/generalpage.cxx
Dosyayı görüntüle @
99dfc263
...
@@ -276,7 +276,8 @@ namespace dbaui
...
@@ -276,7 +276,8 @@ namespace dbaui
_inout_rDisplayName
=
String
();
_inout_rDisplayName
=
String
();
}
}
if
(
eType
==
::
dbaccess
::
DST_EMBEDDED_HSQLDB
)
if
(
eType
==
::
dbaccess
::
DST_EMBEDDED_HSQLDB
||
eType
==
::
dbaccess
::
DST_EMBEDDED_FIREBIRD
)
_inout_rDisplayName
=
String
();
_inout_rDisplayName
=
String
();
return
_inout_rDisplayName
.
getLength
()
>
0
;
return
_inout_rDisplayName
.
getLength
()
>
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment