Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 0783e3f

Browse files
mythzmythz
committed
Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite
2 parents 5127c45 + 5e61a31 commit 0783e3f

File tree

9 files changed

+46
-46
lines changed

9 files changed

+46
-46
lines changed

‎src/ServiceStack.OrmLite.PostgreSQL.Tests/CreatePostgreSQLTablesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ private void CreateSchemaIfNotExists(System.Data.IDbConnection db, string name)
110110
BEGIN
111111
112112
IF NOT EXISTS(
113-
SELECT schema_name
114-
FROM information_schema.schemata
115-
WHERE schema_name = '{0}'
113+
SELECT 1
114+
FROM INFORMATION_SCHEMA.SCHEMATA
115+
WHERE SCHEMA_NAME = '{0}'
116116
)
117117
THEN
118118
EXECUTE 'CREATE SCHEMA ""{0}""';

‎src/ServiceStack.OrmLite.PostgreSQL.Tests/SchemaTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ private void CreateSchemaIfNotExists(System.Data.IDbConnection db)
3131
BEGIN
3232
3333
IF NOT EXISTS(
34-
SELECT schema_name
35-
FROM information_schema.schemata
36-
WHERE schema_name = 'TestSchema'
34+
SELECT 1
35+
FROM INFORMATION_SCHEMA.SCHEMATA
36+
WHERE SCHEMA_NAME = 'TestSchema'
3737
)
3838
THEN
3939
EXECUTE 'CREATE SCHEMA ""TestSchema""';

‎src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerGeographyTypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class SqlServerGeographyTypeConverter : SqlServerSpatialTypeConverter
1111
{
1212
public override string ColumnDefinition
1313
{
14-
get { return "GEOGRAPHY"; }
14+
get { return "geography"; }
1515
}
1616

1717
public override object FromDbValue(Type fieldType, object value)

‎src/ServiceStack.OrmLite.SqlServer.Converters/SqlServerGeometryTypeConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class SqlServerGeometryTypeConverter : SqlServerSpatialTypeConverter
1111
{
1212
public override string ColumnDefinition
1313
{
14-
get { return "GEOMETRY"; }
14+
get { return "geometry"; }
1515
}
1616

1717
public override object FromDbValue(Type fieldType, object value)

‎src/ServiceStack.OrmLite.SqlServerTests/SchemaTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ when character_maximum_length is not null
8686
then '(' + convert(varchar(10), character_maximum_length) + ')'
8787
else ''
8888
end as COLUMN_DEFINITION
89-
FROM information_schema.columns";
89+
FROM INFORMATION_SCHEMA.COLUMNS";
9090

9191
using (var db = OpenDbConnection())
9292
{

‎src/T4/OrmLite.Core.ttinclude

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@ WHERE o.type = 'P'
13391339
'sysdiagrams' )";
13401340

13411341

1342-
const string SP_PARAMETERS_SQL=@"SELECT * from information_schema.PARAMETERS
1342+
const string SP_PARAMETERS_SQL=@"SELECT * from INFORMATION_SCHEMA.PARAMETERS
13431343
where SPECIFIC_NAME = @spname
13441344
order by ORDINAL_POSITION";
13451345

@@ -1644,11 +1644,11 @@ class PostGreSqlSchemaReader : SchemaReader
16441644
string GetPK(string table){
16451645

16461646
string sql=@"SELECT kcu.column_name
1647-
FROM information_schema.key_column_usage kcu
1648-
JOIN information_schema.table_constraints tc
1649-
ON kcu.constraint_name=tc.constraint_name
1650-
WHERE lower(tc.constraint_type)='primary key'
1651-
AND kcu.table_name=@tablename";
1647+
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu
1648+
JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc
1649+
ON kcu.CONSTRAINT_NAME=tc.CONSTRAINT_NAME
1650+
WHERE lower(tc.CONSTRAINT_TYPE)='primary key'
1651+
AND kcu.TABLE_NAME=@tablename";
16521652

16531653
using (var cmd=_factory.CreateCommand())
16541654
{
@@ -1730,16 +1730,16 @@ class PostGreSqlSchemaReader : SchemaReader
17301730

17311731

17321732
const string TABLE_SQL=@"
1733-
SELECT table_name, table_schema, table_type
1734-
FROM information_schema.tables
1735-
WHERE (table_type='BASE TABLE' OR table_type='VIEW')
1736-
AND table_schema NOT IN ('pg_catalog', 'information_schema');
1733+
SELECT TABLE_NAME, TABLE_SCHEMA, TABLE_TYPE
1734+
FROM INFORMATION_SCHEMA.TABLES
1735+
WHERE (TABLE_TYPE='BASE TABLE' OR TABLE_TYPE='VIEW')
1736+
AND TABLE_SCHEMA NOT IN ('pg_catalog', 'INFORMATION_SCHEMA');
17371737
";
17381738

17391739
const string COLUMN_SQL=@"
1740-
SELECT column_name, is_nullable, udt_name, column_default
1741-
FROM information_schema.columns
1742-
WHERE table_name=@tableName;
1740+
SELECT COLUMN_NAME, IS_NULLABLE, UDT_NAME, COLUMN_DEFAULT
1741+
FROM INFORMATION_SCHEMA.COLUMNS
1742+
WHERE TABLE_NAME=@tableName;
17431743
";
17441744

17451745
}
@@ -1869,8 +1869,8 @@ class MySqlSchemaReader : SchemaReader
18691869

18701870
const string TABLE_SQL=@"
18711871
SELECT *
1872-
FROM information_schema.tables
1873-
WHERE (table_type='BASE TABLE' OR table_type='VIEW')
1872+
FROM INFORMATION_SCHEMA.TABLES
1873+
WHERE (TABLE_TYPE='BASE TABLE' OR TABLE_TYPE='VIEW')
18741874
";
18751875

18761876
}

‎tests/ServiceStack.OrmLite.Tests/LoadReferencesJoinTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ public void Can_populate_multiple_POCOs_using_SelectMulti2()
792792
sb.AppendLine(tuple.Item2.Dump());
793793
}
794794

795-
Assert.That(sb.ToString().Replace("\r", "").Trim(), Is.EqualTo(
795+
Assert.That(sb.ToString().NormalizeNewLines().Trim(), Is.EqualTo(
796796
@"Customer:
797797
{
798798
Id: 1,
@@ -804,7 +804,7 @@ public void Can_populate_multiple_POCOs_using_SelectMulti2()
804804
CustomerId: 1,
805805
AddressLine1: 1 Australia Street,
806806
Country: Australia
807-
}"));
807+
}".NormalizeNewLines()));
808808
}
809809

810810
[Test]
@@ -837,7 +837,7 @@ public void Can_populate_multiple_POCOs_using_SelectMulti3()
837837

838838
private static void AssertMultiCustomerOrderResults(StringBuilder sb)
839839
{
840-
Assert.That(sb.ToString().Replace("\r", "").Trim(), Is.EqualTo(
840+
Assert.That(sb.ToString().NormalizeNewLines().Trim(), Is.EqualTo(
841841
@"Customer:
842842
{
843843
Id: 1,
@@ -877,7 +877,7 @@ private static void AssertMultiCustomerOrderResults(StringBuilder sb)
877877
LineItem: Line 2,
878878
Qty: 2,
879879
Cost: 2.99
880-
}"));
880+
}".NormalizeNewLines()));
881881
}
882882
}
883883

‎tests/ServiceStack.OrmLiteV45.Tests/LoadReferenceJoinTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public async Task Can_populate_multiple_POCOs_using_SelectMulti2()
8787
sb.AppendLine(tuple.Item2.Dump());
8888
}
8989

90-
Assert.That(sb.ToString().Replace("\r", "").Trim(), Is.EqualTo(
90+
Assert.That(sb.ToString().NormalizeNewLines().Trim(), Is.EqualTo(
9191
@"Customer:
9292
{
9393
Id: 1,
@@ -99,7 +99,7 @@ public async Task Can_populate_multiple_POCOs_using_SelectMulti2()
9999
CustomerId: 1,
100100
AddressLine1: 1 Australia Street,
101101
Country: Australia
102-
}"));
102+
}".NormalizeNewLines()));
103103
}
104104

105105
[Test]
@@ -130,7 +130,7 @@ public async Task Can_populate_multiple_POCOs_using_SelectMulti3()
130130

131131
private static void AssertMultiCustomerOrderResults(StringBuilder sb)
132132
{
133-
Assert.That(sb.ToString().Replace("\r", "").Trim(), Is.EqualTo(
133+
Assert.That(sb.ToString().NormalizeNewLines().Trim(), Is.EqualTo(
134134
@"Customer:
135135
{
136136
Id: 1,
@@ -170,7 +170,7 @@ private static void AssertMultiCustomerOrderResults(StringBuilder sb)
170170
LineItem: Line 2,
171171
Qty: 2,
172172
Cost: 2.99
173-
}"));
173+
}".NormalizeNewLines()));
174174
}
175175
}
176176
}

‎tests/ServiceStack.OrmLiteV45.Tests/T4/OrmLite.Core.ttinclude

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,7 @@ WHERE o.type = 'P'
11871187
'sysdiagrams' )";
11881188

11891189

1190-
const string SP_PARAMETERS_SQL=@"SELECT * from information_schema.PARAMETERS
1190+
const string SP_PARAMETERS_SQL=@"SELECT * from INFORMATION_SCHEMA.PARAMETERS
11911191
where SPECIFIC_NAME = @spname
11921192
order by ORDINAL_POSITION";
11931193

@@ -1491,12 +1491,12 @@ class PostGreSqlSchemaReader : SchemaReader
14911491

14921492
string GetPK(string table){
14931493

1494-
string sql=@"SELECT kcu.column_name
1495-
FROM information_schema.key_column_usage kcu
1496-
JOIN information_schema.table_constraints tc
1497-
ON kcu.constraint_name=tc.constraint_name
1498-
WHERE lower(tc.constraint_type)='primary key'
1499-
AND kcu.table_name=@tablename";
1494+
string sql=@"SELECT kcu.COLUMN_NAME
1495+
FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu
1496+
JOIN INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc
1497+
ON kcu.CONSTRAINT_NAME=tc.CONSTRAINT_NAME
1498+
WHERE lower(tc.CONSTRAINT_TYPE)='primary key'
1499+
AND kcu.TABLE_NAME=@tablename";
15001500

15011501
using (var cmd=_factory.CreateCommand())
15021502
{
@@ -1578,15 +1578,15 @@ class PostGreSqlSchemaReader : SchemaReader
15781578

15791579

15801580
const string TABLE_SQL=@"
1581-
SELECT table_name, table_schema, table_type
1582-
FROM information_schema.tables
1583-
WHERE (table_type='BASE TABLE' OR table_type='VIEW')
1584-
AND table_schema NOT IN ('pg_catalog', 'information_schema');
1581+
SELECT TABLE_NAME, TABLE_SCHEMA, TABLE_TYPE
1582+
FROM INFORMATION_SCHEMA.TABLES
1583+
WHERE (TABLE_TYPE='BASE TABLE' OR TABLE_TYPE='VIEW')
1584+
AND TABLE_SCHEMA NOT IN ('pg_catalog', 'INFORMATION_SCHEMA');
15851585
";
15861586

15871587
const string COLUMN_SQL=@"
15881588
SELECT column_name, is_nullable, udt_name, column_default
1589-
FROM information_schema.columns
1589+
FROM INFORMATION_SCHEMA.COLUMNS
15901590
WHERE table_name=@tableName;
15911591
";
15921592

@@ -1717,8 +1717,8 @@ class MySqlSchemaReader : SchemaReader
17171717

17181718
const string TABLE_SQL=@"
17191719
SELECT *
1720-
FROM information_schema.tables
1721-
WHERE (table_type='BASE TABLE' OR table_type='VIEW')
1720+
FROM INFORMATION_SCHEMA.TABLES
1721+
WHERE (TABLE_TYPE='BASE TABLE' OR TABLE_TYPE='VIEW')
17221722
";
17231723

17241724
}

0 commit comments

Comments
 (0)