Skip to content
Permalink
Browse files

Use PostGIS and PostgreSQL spelling when appropriate

  • Loading branch information
DelazJ committed Jul 6, 2017
1 parent 6fab688 commit 9e6b8ed59d5dd4acabe2ab61888f09b4b9538fd2
@@ -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
@@ -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
@@ -226,7 +226,7 @@ <H1>2. Overview</H1>
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 @@ <H2>5.4. Install development frameworks for QGIS dependencies</H2>
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>
@@ -2865,7 +2865,7 @@ <H1>28. 0.5</H1>
<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>
@@ -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)

@@ -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
@@ -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
@@ -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.

@@ -193,7 +193,7 @@ def getInfo(self):
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 @@ def renameTable(self, table, new_table):
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 @@ def moveTableToSchema(self, table, new_schema):
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 @@ def moveTable(self, table, new_table, new_schema=None):
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 @@ def addTableColumn(self, table, field_def):
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 @@ def updateTableColumn(self, table, column, new_name=None, data_type=None, not_nu
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 ""
@@ -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 @@ def __init__(self, host=None, port=None, dbname=None, user=None,
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 @@ def check_postgis(self):
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 @@ def list_geotables(self, schema=None):
# 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 @@ def delete_geometry_column(self, table, geom_column, schema=None):
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 @@ def rename_table(self, table, new_table, schema=None):
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 @@ def rename_schema(self, schema, new_schema):
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 @@ def table_column_rename(self, table, name, new_name, schema=None):
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 @@ def table_move_to_schema(self, table, new_schema, schema=None):
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'" \
@@ -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() )
@@ -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;
@@ -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
@@ -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 );

@@ -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
@@ -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 )
@@ -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.
*

0 comments on commit 9e6b8ed

Please sign in to comment.
You can’t perform that action at this time.