Modified:
MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp
MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
MYODBCIns/include/MYODBCIns.h
MYODBCIns/include/MYODBCInsDataSource.h
MYODBCIns/include/MYODBCInsDriver.h
MYODBCIns/include/MYODBCInsDriverConnect.h
MYODBCInstaller/MYODBCInstaller.cpp
MYODBCInstaller/MYODBCInstaller.h
MYODBCInstaller/main.cpp
connector-odbc.vpw
Log:
Modified: MYODBCIns/MYODBCInsLib/MYODBCIns.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/MYODBCInsLib/MYODBCIns.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -4,9 +4,9 @@
Copyright (C) MySQL AB 2004-2006, Released under GPL.
\version Connector/ODBC v5
\date 2006
- \brief Code to provide abstraction and portability for I/O of ODBC installer
information.
+ \brief Code to provide abstraction and portability for I/O of ODBC system
information information.
- \license Copyright (C) 2000-2005 MySQL AB
+ \license GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -353,7 +353,7 @@
SQLGetPrivateProfileString does not work when NULL for first arg.
so we provide first arg and hope that there is at least one
- attribute (its likley anyway).
+ attribute (its likely anyway).
*/
if ( SQLGetPrivateProfileString( stringName.utf16(), NULL, L"", szSectionNames,
sizeof(szSectionNames) / sizeof(SQLWCHAR), L"ODBC.INI" ) > 0 )
{
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDataSource.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -6,7 +6,7 @@
\date 2006
\brief Code to provide abstraction and portability for I/O of ODBC installer
information.
- \license Copyright (C) 2000-2005 MySQL AB
+ \license GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDriver.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -6,7 +6,7 @@
\date 2006
\brief Code to provide abstraction and portability for I/O of ODBC installer
information.
- \license Copyright (C) 2000-2005 MySQL AB
+ \license GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp
===================================================================
--- MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/MYODBCInsLib/MYODBCInsDriverConnect.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -6,7 +6,7 @@
\date 2006
\brief Code to provide abstraction and portability for I/O of ODBC installer
information.
- \license Copyright (C) 2000-2005 MySQL AB
+ \license GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: MYODBCIns/include/MYODBCIns.h
===================================================================
--- MYODBCIns/include/MYODBCIns.h 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/include/MYODBCIns.h 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,3 +1,31 @@
+/*!
+ \file MYODBCIns.h
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief Code to provide abstraction and portability for I/O of ODBC system
information information.
+
+ \license GPL
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef MYODBC_INS_H
#define MYODBC_INS_H
@@ -5,6 +33,18 @@
#include <MYODBCInsDataSource.h>
#include <MYODBCInsDriverConnect.h>
+/*!
+ \brief Installer.
+
+ This is basically a namespace to hold a variety of installer
+ utilities. Any of the installer code which does not belong in
+ the other classes gets placed in here - and typically as a
+ 'static' to avoid having to really instantiate the class.
+
+ \sa MYODBCInsDriver
+ MYODBCInsDataSource
+ MYODBCInsDriverConnect
+*/
class MYODBCIns
{
public:
Modified: MYODBCIns/include/MYODBCInsDataSource.h
===================================================================
--- MYODBCIns/include/MYODBCInsDataSource.h 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/include/MYODBCInsDataSource.h 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,3 +1,31 @@
+/*!
+ \file MYODBCInsDataSource.h
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief Code to provide abstraction and portability for I/O of ODBC system
information information.
+
+ \license GPL
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef MYODBC_INS_DATASOURCE_H
#define MYODBC_INS_DATASOURCE_H
@@ -31,6 +59,32 @@
} MYODBC_INS_DATASOURCE_SCOPE;
+/*!
+ \brief Data Source Name (DSN).
+
+ This is a DSN - it holds the data source name and attributes
+ and can be used to; read, write and edit a data source. \sa MYODBCIns
+ for methods to create and delete a DSN.
+
+ The DSN may exist in the; User, System or both scope.
+
+ \code
+ // create a new DSN
+ MYODBCIns::doInsertDataSource( "MyDSN",
+ "SERVER=localhost;DATABASE=db;UID=myid",
+ MYODBC_INS_DATASOURCE_SCOPE_USER );
+ // later... edit DSN
+ MYODBCInsDataSource ds( MYODBC_INS_DATASOURCE_MODE_DSN_VIEW );
+
+ ds.doRead( "MyDSN", MYODBC_INS_DATASOURCE_SCOPE_USER );
+ da.setDATABASE( "test" );
+ da.doWrite( MYODBC_INS_DATASOURCE_SCOPE_USER );
+ \endcode
+
+ \sa MYODBCIns
+ MYODBCInsDriver
+ MYODBCInsDriverConnect
+*/
class MYODBCInsDataSource
{
public:
Modified: MYODBCIns/include/MYODBCInsDriver.h
===================================================================
--- MYODBCIns/include/MYODBCInsDriver.h 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/include/MYODBCInsDriver.h 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,3 +1,31 @@
+/*!
+ \file MYODBCInsDriver.h
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief Code to provide abstraction and portability for I/O of ODBC system
information information.
+
+ \license GPL
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef MYODBC_INS_DRIVER_H
#define MYODBC_INS_DRIVER_H
@@ -8,7 +36,28 @@
#include <QStringList>
#include <QTextStream>
+/*!
+ \brief Driver
+ This is a driver (in the ODBC system information) - it holds the driver name
and attributes
+ and can be used to; read, write and edit this information. \sa MYODBCIns for
methods to
+ register/deregister a driver.
+
+ \code
+ // register a driver in the ODBC system information so we can use it
+ MYODBCIns::doRegisterDriver( "MySQL Connector/ODBC v5",
+ "DRIVER=myodbc5.dll;SETUP=myodbc5S.dll" );
+ // later... get the name of the SETUP library
+ MYODBCInsDriver d();
+
+ ds.doRead( "MySQL Connector/ODBC v5" );
+ stringSetup = da.getSETUP();
+ \endcode
+
+ \sa MYODBCIns
+ MYODBCInsDataSource
+ MYODBCInsDriverConnect
+*/
class MYODBCInsDriver
{
public:
Modified: MYODBCIns/include/MYODBCInsDriverConnect.h
===================================================================
--- MYODBCIns/include/MYODBCInsDriverConnect.h 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCIns/include/MYODBCInsDriverConnect.h 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,3 +1,31 @@
+/*!
+ \file MYODBCInsDriverConnect.cpp
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief Code to provide abstraction and portability for I/O of ODBC system
information information.
+
+ \license GPL
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef MYODBC_INS_DRIVERCONNECT_H
#define MYODBC_INS_DRIVERCONNECT_H
Modified: MYODBCInstaller/MYODBCInstaller.cpp
===================================================================
--- MYODBCInstaller/MYODBCInstaller.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCInstaller/MYODBCInstaller.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,21 +1,37 @@
-/*!
- \file MYODBCInstaller.cpp
- \author Peter Harvey <peterh@stripped>
- \brief This program will aid installers when installing/uninstalling
- MyODBC.
+/*!
+ \file MYODBCInstaller.cpp
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief This program will aid installers when installing/uninstalling
+ MyODBC.
- This program can; register/deregister a myodbc driver and create
- a sample dsn. The key thing here is that it does this with
- cross-platform code - thanks to the ODBC installer API. This is
- most useful to those creating installers (apps using myodbc or
- myodbc itself).
+ This program can; register/deregister a myodbc driver and create
+ a sample dsn. The key thing here is that it does this with
+ cross-platform code - thanks to the ODBC installer API. This is
+ most useful to those creating installers (apps using myodbc or
+ myodbc itself).
+
+ \license GPL
- For example; this program is used in the postinstall script
- of the MyODBC for OSX installer package.
-
- \note This program uses MYODBCIns in similar fashion to the *driver*
- but does not use it the way MYODBCSetup does and this is
- deliberate.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "MYODBCInstaller.h"
Modified: MYODBCInstaller/MYODBCInstaller.h
===================================================================
--- MYODBCInstaller/MYODBCInstaller.h 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCInstaller/MYODBCInstaller.h 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,3 +1,38 @@
+/*!
+ \file MYODBCInstaller.cpp
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief This program will aid installers when installing/uninstalling
+ MyODBC.
+
+ This program can; register/deregister a myodbc driver and create
+ a sample dsn. The key thing here is that it does this with
+ cross-platform code - thanks to the ODBC installer API. This is
+ most useful to those creating installers (apps using myodbc or
+ myodbc itself).
+
+ \license GPL
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+*/
#ifndef MYODBC_INSTALLER_H
#define MYODBC_INSTALLER_H
@@ -9,6 +44,15 @@
#include <MYODBCC.h>
#include <MYODBCIns.h>
+/*!
+ \brief MYODBCInstaller supporting class.
+
+ This supports the MYODBCInstaller command-line utility by simplifying
+ access to the MYODBCIns library while providing meaningful output for
+ a command-line utility such as error messages.
+
+ \sa MYODBCInstaller
+*/
class MYODBCInstaller : public QObject
{
public:
Modified: MYODBCInstaller/main.cpp
===================================================================
--- MYODBCInstaller/main.cpp 2006-04-17 22:55:52 UTC (rev 80)
+++ MYODBCInstaller/main.cpp 2006-04-18 03:13:16 UTC (rev 81)
@@ -1,21 +1,37 @@
-/*!
- \file main.cpp
- \author Peter Harvey <peterh@stripped>
- \brief This program will aid installers when installing/uninstalling
- MyODBC.
+/*!
+ \file main.cpp
+ \author Peter Harvey <pharvey@stripped>
+ Copyright (C) MySQL AB 2004-2006, Released under GPL.
+ \version Connector/ODBC v5
+ \date 2006
+ \brief This program will aid installers when installing/uninstalling
+ MyODBC.
- This program can; register/deregister a myodbc driver and create
- a sample dsn. The key thing here is that it does this with
- cross-platform code - thanks to the ODBC installer API. This is
- most useful to those creating installers (apps using myodbc or
- myodbc itself).
+ This program can; register/deregister a myodbc driver and create
+ a sample dsn. The key thing here is that it does this with
+ cross-platform code - thanks to the ODBC installer API. This is
+ most useful to those creating installers (apps using myodbc or
+ myodbc itself).
+
+ \license GPL
- For example; this program is used in the postinstall script
- of the MyODBC for OSX installer package.
-
- \note This program uses MYODBCIns in similar fashion to the *driver*
- but does not use it the way MYODBCSetup does and this is
- deliberate.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ There are special exceptions to the terms and conditions of the GPL as it
+ is applied to this software. View the full text of the exception in file
+ EXCEPTIONS in the directory of this software distribution.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "MYODBCInstaller.h"
Modified: connector-odbc.vpw
===================================================================
--- connector-odbc.vpw 2006-04-17 22:55:52 UTC (rev 80)
+++ connector-odbc.vpw 2006-04-18 03:13:16 UTC (rev 81)
@@ -2,7 +2,6 @@
<Workspace Version="10.0" VendorName="SlickEdit">
<Projects>
<Project File="dltest/dltest.vpj" />
- <Project File="../connector-odbc3/myodbc3u/myodbc3u.vpj" />
<Project File="MYODBCAtt/MYODBCAtt.vpj" />
<Project File="MYODBCAtt/MYODBCAttLib/MYODBCAttLib.vpj" />
<Project File="MYODBCAtt/MYODBCAttTest/MYODBCAttTest.vpj" />
| Thread |
|---|
| • Connector/ODBC 5 commit: r81 - / MYODBCIns/MYODBCInsLib MYODBCIns/include MYODBCInstaller | pharvey | 18 Apr |
