sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use PostGIS and PostgreSQL spelling when appropriate

Browse Source
This commit is contained in:
Harrissou Sant-anna 2017-07-06 08:12:55 +02:00
parent 6fab688298
commit 9e6b8ed59d
25 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
INSTALL
View File

@ -116,7 +116,7 @@ Optional dependencies:
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support - PostgreSQL >= 8.0.x
- for PostGIS support - PostgreSQL >= 8.0.x
- for gps plugin - gpsbabel
- for mapserver export and PyQGIS - Python >= 3.3
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2
@ -1252,10 +1252,10 @@ http://www.kyngchaos.com/software/frameworks
Once downloaded, open and install the frameworks.
William provides an additional installer package for Postgresql (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
William provides an additional installer package for PostgreSQL (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:
package. It's available here:
http://www.kyngchaos.com/software/postgres

4
NEWS
View File

@ -1695,7 +1695,7 @@ Added Simon splash screen
Fixed command line loading bug to eliminate bogus warning for vector layers
Modified splashscreen.cpp to allow specification of x,y for text drawing on
the splash image
Imperfectly fixed problem where postgis attributes aren't displayed if the
Imperfectly fixed problem where PostGIS attributes aren't displayed if the
primary key is not of type int4 (bug 1042706).
Added Latvian translation file (untranslated at present)
@ -2540,7 +2540,7 @@ Added QgsRasterLayer::filterLayer which gets called near the end of each of
2004-03-06 [didge] 0.1.0devel6
Changed configure stuff to write DEFINES in config.h.
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
PostgreSQL stuff needs testing as I commented the compileflags in src/Makefile.am
Infos will be posted on the devel mailinglist
2004-03-04 [ts] 0.1.0devel5

8
doc/INSTALL.html
View File

@ -226,7 +226,7 @@ Optional dependencies:
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
<LI>for georeferencer - GSL &gt;= 1.8
<LI>for postgis support - PostgreSQL &gt;= 8.0.x
<LI>for PostGIS support - PostgreSQL &gt;= 8.0.x
<LI>for gps plugin - gpsbabel
<LI>for mapserver export and PyQGIS - Python &gt;= 3.3
<LI>for python support - SIP &gt;= 4.12, PyQt &gt;= 5.3 must match Qt version, Qscintilla2
@ -1744,10 +1744,10 @@ There are also GSL and FreeType frameworks.
Once downloaded, open and install the frameworks.
</P>
<P>
William provides an additional installer package for Postgresql (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
William provides an additional installer package for PostgreSQL (for PostGIS
support). QGIS just needs the libpq client library, so unless you want to
setup the full Postgres + PostGIS server, all you need is the client-only
package. It's available here:
package. It's available here:
</P>
<P>
<A HREF="http://www.kyngchaos.com/software/postgres">http://www.kyngchaos.com/software/postgres</A>

2
doc/news.html
View File

@ -2865,7 +2865,7 @@ Added QgsRasterLayer::filterLayer which gets called near the end of each of
<P>
2004-03-06 [didge] 0.1.0devel6
Changed configure stuff to write DEFINES in config.h.
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
PostgreSQL stuff needs testing as I commented the compileflags in src/Makefile.am
Infos will be posted on the devel mailinglist
</P>
<P>

2
doc/news.t2t
View File

@ -1646,7 +1646,7 @@ Added Simon splash screen
Fixed command line loading bug to eliminate bogus warning for vector layers
Modified splashscreen.cpp to allow specification of x,y for text drawing on
the splash image
Imperfectly fixed problem where postgis attributes aren't displayed if the
Imperfectly fixed problem where PostGIS attributes aren't displayed if the
primary key is not of type int4 (bug 1042706).
Added Latvian translation file (untranslated at present)

2
doc/overview.t2t
View File

@ -36,7 +36,7 @@ Optional dependencies:
is not installed with rpath. The desired GRASS version is chosen on runtime by setting
LD_LIBRARY_PATH or PATH.
- for georeferencer - GSL >= 1.8
- for postgis support - PostgreSQL >= 8.0.x
- for PostGIS support - PostgreSQL >= 8.0.x
- for gps plugin - gpsbabel
- for mapserver export and PyQGIS - Python >= 3.3
- for python support - SIP >= 4.12, PyQt >= 5.3 must match Qt version, Qscintilla2

4
python/core/qgscoordinatereferencesystem.sip
View File

@ -190,7 +190,7 @@ Constructs an invalid CRS object
explicit QgsCoordinateReferenceSystem( const long id, CrsType type = PostgisCrsId );
%Docstring
Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS CRS ID.
.. note::
We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
@ -304,7 +304,7 @@ Allows direct construction of QVariants from QgsCoordinateReferenceSystem.
bool createFromSrid( const long srid );
%Docstring
Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
\param srid The postgis SRID for the desired spatial reference system.
\param srid The PostGIS SRID for the desired spatial reference system.
:return: True on success else false
/ // TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
:rtype: bool

2
python/core/qgsvectorlayer.sip
View File

@ -80,7 +80,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSin
\subsection postgres PostgreSQL data provider (postgres)
Connects to a postgresql database. The url defines the connection parameters, table,
Connects to a PostgreSQL database. The url defines the connection parameters, table,
geometry column, and other attributes. The url can be constructed using the
QgsDataSourceUri class.

12
python/plugins/db_manager/db_plugins/postgis/connector.py
View File

@ -193,7 +193,7 @@ class PostGisDBConnector(DBConnector):
return res
def getSpatialInfo(self):
""" returns tuple about postgis support:
""" returns tuple about PostGIS support:
- lib version
- geos version
- proj version
@ -732,7 +732,7 @@ class PostGisDBConnector(DBConnector):
sql = u"ALTER TABLE %s RENAME TO %s" % (self.quoteId(table), self.quoteId(new_table))
self._execute(c, sql)
# update geometry_columns if postgis is enabled
# update geometry_columns if PostGIS is enabled
if self.has_geometry_columns and not self.is_geometry_columns_view:
schema_where = u" AND f_table_schema=%s " % self.quoteString(schema) if schema is not None else ""
sql = u"UPDATE geometry_columns SET f_table_name=%s WHERE f_table_name=%s %s" % (
@ -751,7 +751,7 @@ class PostGisDBConnector(DBConnector):
sql = u"ALTER TABLE %s SET SCHEMA %s" % (self.quoteId(table), self.quoteId(new_schema))
self._execute(c, sql)
# update geometry_columns if postgis is enabled
# update geometry_columns if PostGIS is enabled
if self.has_geometry_columns and not self.is_geometry_columns_view:
schema, tablename = self.getSchemaTableName(table)
schema_where = u" AND f_table_schema=%s " % self.quoteString(schema) if schema is not None else ""
@ -782,7 +782,7 @@ class PostGisDBConnector(DBConnector):
sql = u"ALTER TABLE %s RENAME TO %s" % (self.quoteId((new_schema, t)), self.quoteId(table))
self._execute(c, sql)
# update geometry_columns if postgis is enabled
# update geometry_columns if PostGIS is enabled
if self.has_geometry_columns and not self.is_geometry_columns_view:
schema, tablename = self.getSchemaTableName(table)
schema_where = u" f_table_schema=%s AND " % self.quoteString(schema) if schema is not None else ""
@ -847,7 +847,7 @@ class PostGisDBConnector(DBConnector):
def deleteTableColumn(self, table, column):
""" delete column from a table """
if self.isGeometryColumn(table, column):
# use postgis function to delete geometry column correctly
# use PostGIS function to delete geometry column correctly
schema, tablename = self.getSchemaTableName(table)
schema_part = u"%s, " % self._quote_unicode(schema) if schema else ""
sql = u"SELECT DropGeometryColumn(%s%s, %s)" % (
@ -886,7 +886,7 @@ class PostGisDBConnector(DBConnector):
self.quoteId(table), self.quoteId(column), self.quoteId(new_name))
self._execute(c, sql)
# update geometry_columns if postgis is enabled
# update geometry_columns if PostGIS is enabled
if self.has_geometry_columns and not self.is_geometry_columns_view:
schema, tablename = self.getSchemaTableName(table)
schema_where = u" f_table_schema=%s AND " % self.quoteString(schema) if schema is not None else ""

18
python/plugins/processing/tools/postgis.py
View File

@ -49,7 +49,7 @@ def uri_from_name(conn_name):
settings.beginGroup(u"/PostgreSQL/connections/%s" % conn_name)
if not settings.contains("database"): # non-existent entry?
raise DbError(QCoreApplication.translate("postgis", 'There is no defined database connection "{0}".').format(conn_name))
raise DbError(QCoreApplication.translate("PostGIS", 'There is no defined database connection "{0}".').format(conn_name))
uri = QgsDataSourceUri()
@ -222,7 +222,7 @@ class GeoDB(object):
password,
err)
if not ok:
raise DbError(QCoreApplication.translate("postgis", 'Action canceled by user'))
raise DbError(QCoreApplication.translate("PostGIS", 'Action canceled by user'))
if user:
self.uri.setUsername(user)
if password:
@ -263,7 +263,7 @@ class GeoDB(object):
return c.fetchone()[0] > 0
def get_postgis_info(self):
"""Returns tuple about postgis support:
"""Returns tuple about PostGIS support:
- lib version
- installed scripts version
- released scripts version
@ -314,7 +314,7 @@ class GeoDB(object):
# LEFT OUTER JOIN: like LEFT JOIN but if there are more matches,
# for join, all are used (not only one)
# First find out whether postgis is enabled
# First find out whether PostGIS is enabled
if not self.has_postgis:
# Get all tables and views
sql = """SELECT pg_class.relname, pg_namespace.nspname,
@ -502,7 +502,7 @@ class GeoDB(object):
self._exec_sql_and_commit(sql)
def delete_geometry_table(self, table, schema=None):
"""Delete table with one or more geometries using postgis function."""
"""Delete table with one or more geometries using PostGIS function."""
if schema:
schema_part = "'%s', " % self._quote_unicode(schema)
@ -555,7 +555,7 @@ class GeoDB(object):
self._quote(new_table))
self._exec_sql_and_commit(sql)
# Update geometry_columns if postgis is enabled
# Update geometry_columns if PostGIS is enabled
if self.has_postgis:
sql = "UPDATE geometry_columns SET f_table_name='%s' \
WHERE f_table_name='%s'" \
@ -598,7 +598,7 @@ class GeoDB(object):
self._quote(new_schema))
self._exec_sql_and_commit(sql)
# Update geometry_columns if postgis is enabled
# Update geometry_columns if PostGIS is enabled
if self.has_postgis:
sql = \
"UPDATE geometry_columns SET f_table_schema='%s' \
@ -628,7 +628,7 @@ class GeoDB(object):
self._quote(name), self._quote(new_name))
self._exec_sql_and_commit(sql)
# Update geometry_columns if postgis is enabled
# Update geometry_columns if PostGIS is enabled
if self.has_postgis:
sql = "UPDATE geometry_columns SET f_geometry_column='%s' \
WHERE f_geometry_column='%s' AND f_table_name='%s'" \
@ -704,7 +704,7 @@ class GeoDB(object):
self._quote(new_schema))
self._exec_sql_and_commit(sql)
# Update geometry_columns if postgis is enabled
# Update geometry_columns if PostGIS is enabled
if self.has_postgis:
sql = "UPDATE geometry_columns SET f_table_schema='%s' \
WHERE f_table_name='%s'" \

2
src/core/expression/qgsexpressionfunction.cpp
View File

@ -2598,7 +2598,7 @@ static QVariant fcnAzimuth( const QVariantList &values, const QgsExpressionConte
return QVariant();
}
// Code from postgis
// Code from PostGIS
if ( pt1->x() == pt2->x() )
{
if ( pt1->y() < pt2->y() )

2
src/core/geometry/qgsgeometryutils.cpp
View File

@ -642,7 +642,7 @@ void QgsGeometryUtils::segmentizeArc( const QgsPoint &p1, const QgsPoint &p2, co
QgsPoint circlePoint2 = p2;
QgsPoint circlePoint3 = clockwise ? p1 : p3 ;
//adapted code from postgis
//adapted code from PostGIS
double radius = 0;
double centerX = 0;
double centerY = 0;

2
src/core/geometry/qgswkbtypes.h
View File

@ -76,7 +76,7 @@ class CORE_EXPORT QgsWkbTypes
GeometryCollection = 7,
CircularString = 8,
CompoundCurve = 9,
CurvePolygon = 10, //13, //should be 10. Seems to be correct in newer postgis versions
CurvePolygon = 10, //13, //should be 10. Seems to be correct in newer PostGIS versions
MultiCurve = 11,
MultiSurface = 12,
NoGeometry = 100, //attributes only

10
src/core/qgscoordinatereferencesystem.h
View File

@ -220,7 +220,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
*/ // TODO QGIS 3: remove "POSTGIS" and "INTERNAL", allow PROJ4 without the prefix
explicit QgsCoordinateReferenceSystem( const QString &definition );
/** Constructor a CRS object using a postgis SRID, an EPSG code or an internal QGIS CRS ID.
/** Constructor a CRS object using a PostGIS SRID, an EPSG code or an internal QGIS CRS ID.
* \note We encourage you to use EPSG code, WKT or Proj4 to describe CRS's in your code
* wherever possible. Internal QGIS CRS IDs are not guaranteed to be permanent / involatile.
* \param id The ID valid for the chosen CRS ID type
@ -314,7 +314,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
bool createFromOgcWmsCrs( const QString &crs );
/** Sets this CRS by lookup of the given PostGIS SRID in the CRS database.
* \param srid The postgis SRID for the desired spatial reference system.
* \param srid The PostGIS SRID for the desired spatial reference system.
* \returns True on success else false
*/ // TODO QGIS 3: remove unless really necessary - let's use EPSG codes instead
bool createFromSrid( const long srid );
@ -597,13 +597,13 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
*/
static QString proj4FromSrsId( const int srsId );
/** Set the QGIS SrsId
/** Set the QGIS SrsId
* \param srsId The internal sqlite3 srs.db primary key for this CRS
*/
void setInternalId( long srsId );
/** Set the postgis srid
* \param srid The postgis spatial_ref_sys key for this CRS
/** Set the PostGIS srid
* \param srid The PostGIS spatial_ref_sys key for this CRS
*/
void setSrid( long srid );

2
src/core/qgscoordinatereferencesystem_p.h
View File

@ -105,7 +105,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
//! The map units for the CRS
QgsUnitTypes::DistanceUnit mMapUnits;
//! If available, the Postgis spatial_ref_sys identifier for this CRS (defaults to 0)
//! If available, the PostGIS spatial_ref_sys identifier for this CRS (defaults to 0)
long mSRID;
//! If available the authority identifier for this CRS

2
src/core/qgsdataitem.cpp
View File

@ -1114,7 +1114,7 @@ void QgsZipItem::init()
{
QString k( *i );
QgsDebugMsgLevel( "provider " + k, 3 );
// some providers hangs with empty uri (Postgis) etc...
// some providers hangs with empty uri (PostGIS) etc...
// -> using libraries directly
std::unique_ptr< QLibrary > library( QgsProviderRegistry::instance()->createProviderLibrary( k ) );
if ( library )

2
src/core/qgsvectorlayer.h
View File

@ -136,7 +136,7 @@ typedef QSet<int> QgsAttributeIds;
*
* \subsection postgres PostgreSQL data provider (postgres)
*
* Connects to a postgresql database. The url defines the connection parameters, table,
* Connects to a PostgreSQL database. The url defines the connection parameters, table,
* geometry column, and other attributes. The url can be constructed using the
* QgsDataSourceUri class.
*

22
src/gui/qgsmanageconnectionsdialog.cpp
View File

@ -280,7 +280,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsWMSConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an WMS connections exchange file." ) );
tr( "The file is not a WMS connections exchange file." ) );
return false;
}
break;
@ -289,7 +289,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsWFSConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an WFS connections exchange file." ) );
tr( "The file is not a WFS connections exchange file." ) );
return false;
}
break;
@ -298,7 +298,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsWCSConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an WCS connections exchange file." ) );
tr( "The file is not a WCS connections exchange file." ) );
return false;
}
break;
@ -307,7 +307,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsPgConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an PostGIS connections exchange file." ) );
tr( "The file is not a PostGIS connections exchange file." ) );
return false;
}
break;
@ -316,7 +316,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsMssqlConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an MSSQL connections exchange file." ) );
tr( "The file is not a MSSQL connections exchange file." ) );
return false;
}
break;
@ -332,7 +332,7 @@ bool QgsManageConnectionsDialog::populateConnections()
if ( root.tagName() != QLatin1String( "qgsDb2Connections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an DB2 connections exchange file." ) );
tr( "The file is not a DB2 connections exchange file." ) );
return false;
}
break;
@ -586,7 +586,7 @@ void QgsManageConnectionsDialog::loadOWSConnections( const QDomDocument &doc, co
if ( root.tagName() != "qgs" + service.toUpper() + "Connections" )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an %1 connections exchange file." ).arg( service ) );
tr( "The file is not a %1 connections exchange file." ).arg( service ) );
return;
}
@ -673,7 +673,7 @@ void QgsManageConnectionsDialog::loadWfsConnections( const QDomDocument &doc, co
if ( root.tagName() != QLatin1String( "qgsWFSConnections" ) )
{
QMessageBox::information( this, tr( "Loading connections" ),
tr( "The file is not an WFS connections exchange file." ) );
tr( "The file is not a WFS connections exchange file." ) );
return;
}
@ -755,7 +755,7 @@ void QgsManageConnectionsDialog::loadPgConnections( const QDomDocument &doc, con
{
QMessageBox::information( this,
tr( "Loading connections" ),
tr( "The file is not an PostGIS connections exchange file." ) );
tr( "The file is not a PostGIS connections exchange file." ) );
return;
}
@ -845,7 +845,7 @@ void QgsManageConnectionsDialog::loadMssqlConnections( const QDomDocument &doc,
{
QMessageBox::information( this,
tr( "Loading connections" ),
tr( "The file is not an MSSQL connections exchange file." ) );
tr( "The file is not a MSSQL connections exchange file." ) );
return;
}
@ -1021,7 +1021,7 @@ void QgsManageConnectionsDialog::loadDb2Connections( const QDomDocument &doc, co
{
QMessageBox::information( this,
tr( "Loading connections" ),
tr( "The file is not an DB2 connections exchange file." ) );
tr( "The file is not a DB2 connections exchange file." ) );
return;
}

2
src/plugins/spatialquery/qgsspatialquerydialog.cpp
View File

@ -278,7 +278,7 @@ QgsSpatialQueryDialog::TypeVerifyCreateSubset QgsSpatialQueryDialog::verifyCreat
fieldFID = QStringLiteral( "FID" );
return VerifyOk;
}
// Database Postgis and SpatiaLite
// Database PostGIS and SpatiaLite
if ( providerType == QLatin1String( "POSTGRES" ) || providerType == QLatin1String( "SPATIALITE" ) )
{
fieldFID = mLayerTarget->dataProvider()->fields().at( 0 ).name();

2
src/providers/delimitedtext/qgsdelimitedtextprovider.h
View File

@ -230,7 +230,7 @@ class QgsDelimitedTextProvider : public QgsVectorDataProvider
mutable int mWktFieldIndex;
// mWktPrefix regexp is used to clean up
// prefixes sometimes used for WKT (postgis EWKT, informix SRID)
// prefixes sometimes used for WKT (PostGIS EWKT, informix SRID)
bool mWktHasPrefix;
//! Layer extent

4
src/providers/postgres/qgspostgresconn.cpp
View File

@ -620,7 +620,7 @@ bool QgsPostgresConn::getTableInfo( bool searchGeometryColumnsOnly, bool searchP
for ( int i = 0; i < result.PQntuples(); i++ )
{
// Have the column name, schema name and the table name. The concept of a
// catalog doesn't exist in postgresql so we ignore that, but we
// catalog doesn't exist in PostgreSQL so we ignore that, but we
// do need to get the geometry type.
QString tableName = result.PQgetvalue( i, 0 ); // relname
@ -866,7 +866,7 @@ QString QgsPostgresConn::postgisVersion()
mUseWkbHex = mPostgisVersionMajor < 1;
// apparently postgis 1.5.2 doesn't report capabilities in postgis_version() anymore
// apparently PostGIS 1.5.2 doesn't report capabilities in postgis_version() anymore
if ( mPostgisVersionMajor > 1 || ( mPostgisVersionMajor == 1 && mPostgisVersionMinor >= 5 ) )
{
result = PQexec( QStringLiteral( "SELECT postgis_geos_version(),postgis_proj_version()" ) );

4
src/providers/postgres/qgspostgresfeatureiterator.cpp
View File

@ -457,7 +457,7 @@ QString QgsPostgresFeatureIterator::whereClauseRect()
if ( mRequest.flags() & QgsFeatureRequest::ExactIntersect )
{
QString curveToLineFn; // in postgis < 1.5 the st_curvetoline function does not exist
QString curveToLineFn; // in PostGIS < 1.5 the st_curvetoline function does not exist
if ( mConn->majorVersion() >= 2 || ( mConn->majorVersion() == 1 && mConn->minorVersion() >= 5 ) )
curveToLineFn = QStringLiteral( "st_curvetoline" ); // st_ prefix is always used
whereClause += QStringLiteral( " AND %1(%2(%3%4),%5)" )
@ -534,7 +534,7 @@ bool QgsPostgresFeatureIterator::declareCursor( const QString &whereClause, long
// Simplify again with st_simplify after first simplification ?
bool postSimplification;
postSimplification = false; // default to false. Set to true only for postgis >= 2.2 when using st_removerepeatedpoints
postSimplification = false; // default to false. Set to true only for PostGIS >= 2.2 when using st_removerepeatedpoints
if ( mRequest.simplifyMethod().methodType() == QgsSimplifyMethod::OptimizeForRendering )
{

8
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -192,7 +192,7 @@ QgsPostgresProvider::QgsPostgresProvider( QString const &uri )
return;
}
// Set the postgresql message level so that we don't get the
// Set the PostgreSQL message level so that we don't get the
// 'there is no transaction in progress' warning.
#ifndef QGISDEBUG
mConnectionRO->PQexecNR( "set client_min_messages to error" );
@ -351,7 +351,7 @@ QgsFeatureIterator QgsPostgresProvider::getFeatures( const QgsFeatureRequest &re
{
if ( !mValid )
{
QgsMessageLog::logMessage( tr( "Read attempt on an invalid postgresql data source" ), tr( "PostGIS" ) );
QgsMessageLog::logMessage( tr( "Read attempt on an invalid PostgreSQL data source" ), tr( "PostGIS" ) );
return QgsFeatureIterator();
}
@ -1714,7 +1714,7 @@ bool QgsPostgresProvider::parseDomainCheckConstraint( QStringList &enumValues, c
//we assume that the constraint is of the following form:
//(VALUE = ANY (ARRAY['a'::text, 'b'::text, 'c'::text, 'd'::text]))
//normally, postgresql creates that if the contstraint has been specified as 'VALUE in ('a', 'b', 'c', 'd')
//normally, PostgreSQL creates that if the contstraint has been specified as 'VALUE in ('a', 'b', 'c', 'd')
int anyPos = checkDefinition.indexOf( QRegExp( "VALUE\\s*=\\s*ANY\\s*\\(\\s*ARRAY\\s*\\[" ) );
int arrayPosition = checkDefinition.lastIndexOf( QLatin1String( "ARRAY[" ) );
@ -3124,7 +3124,7 @@ QgsRectangle QgsPostgresProvider::extent() const
{
ext = result.PQgetvalue( 0, 0 );
// fix for what might be a postgis bug: when the extent crosses the
// fix for what might be a PostGIS bug: when the extent crosses the
// dateline extent() returns -180 to 180 (which appears right), but
// estimated_extent() returns eastern bound of data (>-180) and
// 180 degrees.

4
tests/README.md
View File

@ -48,7 +48,7 @@ Make sure that you have enabled building of postgres test in CMake.
`cmake -DENABLE_TESTS=ON -DENABLE_PGTEST=ON ..`
To test the postgres provider you will need to have a database available to
which the postgres provider can connect. The server will need to have postgis
which the postgres provider can connect. The server will need to have PostGIS
support enabled.
By default the test uses one of the following connection string:
@ -66,7 +66,7 @@ the sql-scripts:
tests/testdata/provider/testdata_pg*.sql
They take care of activating postgis for the test database and
They take care of activating PostGIS for the test database and
create some tables containing test data.
For convenience, a shell script is provided to create the database

4
tests/src/python/test_authmanager_pki_postgres.py
View File

@ -14,7 +14,7 @@ Configuration from the environment:
From build dir, run: ctest -R PyQgsAuthManagerPKIPostgresTest -V
or, if your postgresql path differs from the default:
or, if your PostgreSQL path differs from the default:
QGIS_POSTGRES_EXECUTABLE_PATH=/usr/lib/postgresql/<your_version_goes_here>/bin \
ctest -R PyQgsAuthManagerPKIPostgresTest -V
@ -175,7 +175,7 @@ class TestAuthManager(unittest.TestCase):
if line.find(b"database system is ready to accept") != -1:
break
if time.time() > end:
raise Exception("Timeout connecting to postgresql")
raise Exception("Timeout connecting to PostgreSQL")
# Create a DB
subprocess.check_call([os.path.join(QGIS_POSTGRES_EXECUTABLE_PATH, 'createdb'), '-h', 'localhost', '-p', cls.port, 'test_pki'])
# Inject test SQL from test path