Skip to content

Commit b976585

Browse files
Remove PostgreSQL backslash escape leapfrog
1 parent b19b522 commit b976585

File tree

7 files changed

+3
-48
lines changed

7 files changed

+3
-48
lines changed

doc/reference/modules/configuration.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1527,11 +1527,6 @@ in the parameter binding.</programlisting>
15271527
<row>
15281528
<entry>PostgreSQL</entry>
15291529
<entry><literal>NHibernate.Dialect.PostgreSQLDialect</literal></entry>
1530-
<entry>
1531-
This dialect enables backslash escape sequences by default,
1532-
see the <literal>escape_backslash_in_strings</literal> configuration
1533-
property.
1534-
</entry>
15351530
</row>
15361531
<row>
15371532
<entry>PostgreSQL 8.1</entry>
@@ -1557,15 +1552,6 @@ in the parameter binding.</programlisting>
15571552
This dialect supports <literal>XML</literal> type.
15581553
</entry>
15591554
</row>
1560-
<row>
1561-
<entry>PostgreSQL 9.1</entry>
1562-
<entry><literal>NHibernate.Dialect.PostgreSQL91Dialect</literal></entry>
1563-
<entry>
1564-
This dialect disables backslash escape sequences by default
1565-
see the <literal>escape_backslash_in_strings</literal> configuration
1566-
property.
1567-
</entry>
1568-
</row>
15691555
<row>
15701556
<entry>SQLite</entry>
15711557
<entry><literal>NHibernate.Dialect.SQLiteDialect</literal></entry>

psake.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Task Set-Configuration {
3636
'PostgreSQL' = @{
3737
'connection.connection_string' = 'Host=localhost;Port=5432;Username=postgres;Password=Password12!;Database=nhibernate;Enlist=true';
3838
'connection.driver_class' = 'NHibernate.Driver.NpgsqlDriver';
39-
'dialect' = 'NHibernate.Dialect.PostgreSQL91Dialect'
39+
'dialect' = 'NHibernate.Dialect.PostgreSQL83Dialect'
4040
};
4141
'SQLite' = @{
4242
<#

src/NHibernate.Config.Templates/PostgreSQL.cfg.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ for your own use before compile tests in VisualStudio.
1010
<property name="connection.connection_string">
1111
Server=localhost;Database=nhibernate;User ID=nhibernate;Password=nhibernate;Enlist=true;
1212
</property>
13-
<property name="dialect">NHibernate.Dialect.PostgreSQL91Dialect</property>
13+
<property name="dialect">NHibernate.Dialect.PostgreSQL83Dialect</property>
1414
</session-factory>
1515
</hibernate-configuration>

src/NHibernate.Test/TestDialects/PostgreSQL91TestDialect.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/NHibernate/Dialect/PostgreSQL91Dialect.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/NHibernate/Dialect/PostgreSQLDialect.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,11 +320,6 @@ public override string CurrentTimestampSelectString
320320
get { return "SELECT CURRENT_TIMESTAMP"; }
321321
}
322322

323-
/// <inheritdoc />
324-
/// <remarks><see langword="true" /> by default for PostgreSQL up until version 9.1,
325-
/// <see href="https://www.postgresql.org/docs/current/sql-syntax-lexical.html#SQL-SYNTAX-STRINGS-ESCAPE" />.</remarks>
326-
protected override bool EscapeBackslashInStrings { get; set; } = true;
327-
328323
#region Overridden informational metadata
329324

330325
public override bool SupportsEmptyInList => false;

teamcity.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<target name="setup-teamcity-postgresql">
127127
<property name="db-service" value="postgresql-x64-10" />
128128
<property name="nhibernate.connection.driver_class" value="NHibernate.Driver.NpgsqlDriver" />
129-
<property name="nhibernate.dialect" value="NHibernate.Dialect.PostgreSQL91Dialect" />
129+
<property name="nhibernate.dialect" value="NHibernate.Dialect.PostgreSQL83Dialect" />
130130
<property name="nhibernate.connection.connection_string" value="Host=localhost;Port=5432;Database=nhibernate;Username=nhibernate;Password=nhibernate;Enlist=true" />
131131
</target>
132132

0 commit comments

Comments
 (0)