diff --git a/CHANGELOG.md b/CHANGELOG.md index f3a3b6d..08134e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## Unreleased * change default case conversions for generated files (#196) -* enum type safety #205 +* enum type safety (#205) +* postgress geography type support (#232) ## 0.3.5 diff --git a/README.md b/README.md index 80bddc0..24f0c87 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Options: [default: "./output"] -s, --schema Schema name to create model from. Only for mssql and postgres. You can pass multiple values - separted by comma eg. -s scheme1,scheme2,scheme3 + separated by comma eg. -s scheme1,scheme2,scheme3 --ssl [boolean] [default: false] ``` ### Examples diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts index cdd0796..174becb 100644 --- a/src/drivers/PostgresDriver.ts +++ b/src/drivers/PostgresDriver.ts @@ -390,6 +390,7 @@ export default class PostgresDriver extends AbstractDriver { switch (udtName) { case "citext": case "hstore": + case "geography": case "geometry": ret.sqlType = udtName; break; diff --git a/test/integration/entityTypes/postgres/entity/Post.ts b/test/integration/entityTypes/postgres/entity/Post.ts index 77012f0..be2d592 100644 --- a/test/integration/entityTypes/postgres/entity/Post.ts +++ b/test/integration/entityTypes/postgres/entity/Post.ts @@ -186,4 +186,7 @@ export class Post { @Column("daterange") daterange: string; + + @Column("geography") + geography: string; } diff --git a/test/utils/GeneralTestUtils.ts b/test/utils/GeneralTestUtils.ts index 6821ee6..1606c59 100644 --- a/test/utils/GeneralTestUtils.ts +++ b/test/utils/GeneralTestUtils.ts @@ -1,7 +1,9 @@ import { ConnectionOptions, createConnection } from "typeorm"; import * as ts from "typescript"; import * as yn from "yn"; -import IGenerationOptions, { getDefaultGenerationOptions } from "../../src/IGenerationOptions"; +import IGenerationOptions, { + getDefaultGenerationOptions +} from "../../src/IGenerationOptions"; import IConnectionOptions from "../../src/IConnectionOptions"; import MssqlDriver from "../../src/drivers/MssqlDriver"; import MariaDbDriver from "../../src/drivers/MariaDbDriver"; @@ -82,7 +84,7 @@ export async function createPostgresModels( databaseType: "postgres", schemaName: "public,sch1,sch2", ssl: yn(process.env.POSTGRES_SSL, { default: false }), - skipTables: [] + skipTables: ["spatial_ref_sys"] }; await driver.ConnectToServer(connectionOptions); connectionOptions.databaseName = String(process.env.POSTGRES_Database); @@ -310,7 +312,7 @@ export function compileTsFiles( ); console.log( `${diagnostic.file!.fileName} (${lineAndCharacter.line + - 1},${lineAndCharacter.character + 1}): ${message}` + 1},${lineAndCharacter.character + 1}): ${message}` ); compiledWithoutErrors = false; });