paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 13:40:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Move connections to separate unit

Browse Source 
git-svn-id: trunk@57685 -
This commit is contained in:
michael 2018-04-22 15:36:38 +00:00
parent 50c9ee5151
commit 3b9ac41419
4 changed files with 90 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1567,6 +1567,7 @@ components/fpreport/design/lazidefpreport.lpk svneol=native#text/plain
components/fpreport/design/lazidefpreport.pas svneol=native#text/plain
components/fpreport/design/lazideregfpreport.pp svneol=native#text/plain
components/fpreport/design/regfpdesigner.pp svneol=native#text/plain
components/fpreport/design/reportconns.pp svneol=native#text/plain
components/fpreport/design/reportdesign.ico -text
components/fpreport/design/reportdesign.lpi svneol=native#text/plain
components/fpreport/design/reportdesign.lpr svneol=native#text/plain

75
components/fpreport/design/reportconns.pp Normal file
View File

@ -0,0 +1,75 @@
unit reportconns;
// Connections to be included
{$DEFINE HASIBCONNECTION}
{$DEFINE HASMYSQL50CONNECTION}
{$DEFINE HASMYSQL55CONNECTION}
{$DEFINE HASMYSQL4CONNECTION}
{$DEFINE HASPQCONNECTION}
{$DEFINE HASSQLITE3CONNECTION}
{$IF (FPC_FULLVERSION>30302) or not defined(win64)}
{$DEFINE HASORACLECONNECTION}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20601}
// MS SQL Server and Sybase ASE connectors were introduced in the FPC 2.7 development branch,
// and backported to 2.6.1. Operating systems should match FPC packages\fcl-db\fpmake.pp
{$IF DEFINED(BEOS) OR DEFINED(HAIKU) OR DEFINED(LINUX) OR DEFINED(FREEBSD) OR DEFINED (NETBSD) OR DEFINED(OPENBSD) OR DEFINED(WIN32) OR DEFINED(WIN64)}
{$DEFINE HASMSSQLCONNECTION}
{$DEFINE HASSYBASECONNECTION}
{$ENDIF}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20603}
{$DEFINE HASMYSQL56CONNECTION}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20701}
{$DEFINE HASMYSQL57CONNECTION}
{$ENDIF}
{$mode objfpc}{$H+}
interface
uses
{$IFDEF HASIBCONNECTION}
ibconnection,
{$ENDIF}
{$IFDEF HASMSSQLCONNECTION}
// mssqlconn provide both MS SQL Server and Sybase ASE connectors.
mssqlconn,
{$ENDIF}
odbcconn,
{$IFDEF HASPQCONNECTION}
pqconnection,
{$ENDIF}
{$IFDEF HASORACLECONNECTION}
oracleconnection,
{$ENDIF}
{$IFDEF HASMYSQL4CONNECTION}
mysql40conn, mysql41conn,
{$ENDIF}
{$IFDEF HASMYSQL50CONNECTION}
mysql50conn,
mysql51conn,
{$ENDIF}
{$IFDEF HASMYSQL55CONNECTION}
mysql55conn,
{$ENDIF}
{$IFDEF HASMYSQL56CONNECTION}
mysql56conn,
{$ENDIF}
{$IFDEF HASMYSQL57CONNECTION}
mysql57conn,
{$ENDIF}
{$IFDEF HASSQLITE3CONNECTION}
sqlite3conn,
{$ENDIF}
sqldb;
implementation
end.

6
components/fpreport/design/reportdesign.lpi
View File

@ -48,11 +48,15 @@
<PackageName Value="LCL"/>
</Item6>
</RequiredPackages>
<Units Count="1">
<Units Count="2">
<Unit0>
<Filename Value="reportdesign.lpr"/>
<IsPartOfProject Value="True"/>
</Unit0>
<Unit1>
<Filename Value="reportconns.pp"/>
<IsPartOfProject Value="True"/>
</Unit1>
</Units>
</ProjectOptions>
<CompilerOptions>

81
components/fpreport/design/reportdesign.lpr
View File

@ -2,79 +2,21 @@ program reportdesign;
{$mode objfpc}{$H+}
// Connections to be included
{$DEFINE HASIBCONNECTION}
{$DEFINE HASMYSQL50CONNECTION}
{$DEFINE HASMYSQL55CONNECTION}
{$DEFINE HASMYSQL4CONNECTION}
{$DEFINE HASPQCONNECTION}
{$DEFINE HASSQLITE3CONNECTION}
{$IF (FPC_FULLVERSION>30302) or not defined(win64)}
{$DEFINE HASORACLECONNECTION}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20601}
// MS SQL Server and Sybase ASE connectors were introduced in the FPC 2.7 development branch,
// and backported to 2.6.1. Operating systems should match FPC packages\fcl-db\fpmake.pp
{$IF DEFINED(BEOS) OR DEFINED(HAIKU) OR DEFINED(LINUX) OR DEFINED(FREEBSD) OR DEFINED (NETBSD) OR DEFINED(OPENBSD) OR DEFINED(WIN32) OR DEFINED(WIN64)}
{$DEFINE HASMSSQLCONNECTION}
{$DEFINE HASSYBASECONNECTION}
{$ENDIF}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20603}
{$DEFINE HASMYSQL56CONNECTION}
{$ENDIF}
{$IF FPC_FULLVERSION >= 20701}
{$DEFINE HASMYSQL57CONNECTION}
{$ENDIF}
uses
{$IFDEF UNIX}{$IFDEF UseCThreads}
cthreads,
{$ENDIF}{$ENDIF}
{$IFDEF HASIBCONNECTION}
ibconnection,
{$ENDIF}
{$IFDEF HASMSSQLCONNECTION}
// mssqlconn provide both MS SQL Server and Sybase ASE connectors.
mssqlconn,
{$ENDIF}
odbcconn,
{$IFDEF HASPQCONNECTION}
pqconnection,
{$IFDEF HASPQEVENT}
pqteventmonitor,
{$ENDIF}
{$ENDIF}
{$IFDEF HASORACLECONNECTION}
oracleconnection,
{$ENDIF}
{$IFDEF HASMYSQL4CONNECTION}
mysql40conn, mysql41conn,
{$ENDIF}
{$IFDEF HASMYSQL50CONNECTION}
mysql50conn,
mysql51conn,
{$ENDIF}
{$IFDEF HASMYSQL55CONNECTION}
mysql55conn,
{$ENDIF}
{$IFDEF HASMYSQL56CONNECTION}
mysql56conn,
{$ENDIF}
{$IFDEF HASMYSQL57CONNECTION}
mysql57conn,
{$ENDIF}
{$IFDEF HASSQLITE3CONNECTION}
sqlite3conn,
{$ENDIF}
// Database connectivity
sqldb,
reportconns,
fpreport,
fpreportdb,
// Exports
fpreportpdfexport,
fpreporthtmlexport,
fpreportpreview,
fpreportformexport,
Interfaces, // this includes the LCL widgetset
Forms,
runtimetypeinfocontrols,
@ -99,12 +41,7 @@ uses
frmfpreportpreviewdata,
cfgfpreportpdfexport,
cfgfpreportimageexport,
cfgfpreporthtmlexport,
//
sqldb,
fpreporthtmlexport,
fpreportpreview,
fpreportformexport;
cfgfpreporthtmlexport;
{$R *.res}