paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-09 21:48:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-db: mysql: remove obsolete mysql4conn unit replaced by mysql40conn and mysql41conn

Browse Source 
git-svn-id: trunk@26221 -
This commit is contained in:
lacak 2013-12-12 06:41:58 +00:00
parent 996e802606
commit 9b4735032b
6 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -2149,7 +2149,6 @@ packages/fcl-db/src/sqldb/mysql/fpmake.inc svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/fpmake.pp svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql40conn.pas svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql41conn.pas svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql4conn.pas svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql50conn.pas svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql51conn.pas svneol=native#text/plain
packages/fcl-db/src/sqldb/mysql/mysql55conn.pas svneol=native#text/plain

12
packages/fcl-db/fpmake.pp
View File

@ -583,6 +583,7 @@ begin
begin
AddUnit('db');
end;
T:=P.Targets.AddUnit('mysql40conn.pas', SqldbConnectionOSes);
T.ResourceStrings:=true;
with T.Dependencies do
@ -603,16 +604,7 @@ begin
AddUnit('db');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('mysql4conn.pas', SqldbConnectionOSes);
T.ResourceStrings:=true;
with T.Dependencies do
begin
AddInclude('mysqlconn.inc');
AddUnit('bufdataset');
AddUnit('sqldb');
AddUnit('db');
AddUnit('dbconst');
end;
T:=P.Targets.AddUnit('mysql50conn.pas', SqldbConnectionOSes);
T.ResourceStrings:=true;
with T.Dependencies do

6
packages/fcl-db/src/sqldb/mysql/Makefile.fpc
View File

@ -1,13 +1,13 @@
#
# Makefile.fpc for SQL IBConnection
# Makefile.fpc for SQL MySQLConnection
#
[package]
main=fcl-db
[target]
units=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn
rsts=mysql40conn mysql41conn mysql50conn mysql4conn mysql51conn mysql55conn
units=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn
rsts=mysql40conn mysql41conn mysql50conn mysql51conn mysql55conn mysql56conn
[require]
packages=fcl-xml mysql

2
packages/fcl-db/src/sqldb/mysql/fpmake.inc
View File

@ -7,5 +7,3 @@ Targets.ResetDefaults;
Targets.DefaultDir:='db/sqldb/mysql';
{ Drivers only for the following OSes }
Targets.DefaultOS:=[win32,openbsd,netbsd,freebsd,darwin,linux,haiku];
T:=Targets.AddUnit('mysql4conn');
T.ResourceStrings:=True;

13
packages/fcl-db/src/sqldb/mysql/mysql4conn.pas
View File

@ -1,13 +0,0 @@
{
Contains the TMysqlConnection for MySQL 4.0
temporary backwards compatibility for Lazarus
}
unit mysql4conn;
{$DEFINE MYSQL4}
{$i mysqlconn.inc}
end.

4
packages/fcl-db/src/sqldb/testsqldb.pp
View File

@ -22,7 +22,7 @@ program testsqldb;
uses
Classes,
pqconnection,
mysql4conn,
mysql51conn,
IBConnection,
sqlite3conn,
sqldb;
@ -35,7 +35,7 @@ var connection : tSQLConnection;
begin
dbtype := paramstr(1);
if dbtype = 'mysql' then connection := tMySQLConnection.Create(nil);
if dbtype = 'mysql' then connection := tMySQL51Connection.Create(nil);
if dbtype = 'postgresql' then connection := tpqConnection.Create(nil);
if dbtype = 'interbase' then connection := tIBConnection.Create(nil);
if dbtype = 'sqlite3' then connection := tSQLite3Connection.Create(nil);