Commit 98d4ea3

author

rafgger

committed

working version, docker needs to be running

1 parent b129f42 commit 98d4ea3Copy full SHA for 98d4ea3

File tree

+35

-29

lines changed

+35

-29

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,15 @@`
`1`	`1`	`from sqlalchemy import create_engine`
`2`	`2`	`from sqlalchemy.ext.declarative import declarative_base`
`3`	`3`	`from sqlalchemy.orm import sessionmaker`
	`4`	`+from .config import settings`
	`5`	`+from fastapi_utils.guid_type import setup_guids_postgresql`
`4`	`6`
`5`		`-SQLITE_DATABASE_URL = "sqlite:///./note.db"`
	`7`	`+POSTGRES_URL = f"postgresql://{settings.POSTGRES_USER}:{settings.POSTGRES_PASSWORD}@{settings.POSTGRES_HOSTNAME}:{settings.DATABASE_PORT}/{settings.POSTGRES_DB}"`
`6`	`8`
`7`	`9`	`engine = create_engine(`
`8`		`- SQLITE_DATABASE_URL, echo=True, connect_args={"check_same_thread": False}`
	`10`	`+ POSTGRES_URL, echo=True`
`9`	`11`	`)`
	`12`	`+setup_guids_postgresql(engine)`
`10`	`13`	`SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)`
`11`	`14`
`12`	`15`	`Base = declarative_base()`
`@@ -18,3 +21,4 @@ def get_db():`
`18`	`21`	`yield db`
`19`	`22`	`finally:`
`20`	`23`	`db.close()`
	`24`	`+`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,19 @@`
`1`	`1`	`from .database import Base`
`2`	`2`	`from sqlalchemy import TIMESTAMP, Column, String, Boolean`
`3`	`3`	`from sqlalchemy.sql import func`
`4`		`-from fastapi_utils.guid_type import GUID, GUID_DEFAULT_SQLITE`
	`4`	`+from fastapi_utils.guid_type import GUID, GUID_SERVER_DEFAULT_POSTGRESQL`
`5`	`5`
`6`	`6`
`7`	`7`	`class Note(Base):`
`8`	`8`	`__tablename__ = 'notes'`
`9`		`- id = Column(GUID, primary_key=True, default=GUID_DEFAULT_SQLITE)`
	`9`	`+ id = Column(GUID, primary_key=True,`
	`10`	`+ server_default=GUID_SERVER_DEFAULT_POSTGRESQL)`
`10`	`11`	`title = Column(String, nullable=False)`
`11`	`12`	`content = Column(String, nullable=False)`
`12`	`13`	`category = Column(String, nullable=True)`
`13`		`- published = Column(Boolean, nullable=False, default=True)`
	`14`	`+ published = Column(Boolean, nullable=False, server_default='True')`
`14`	`15`	`createdAt = Column(TIMESTAMP(timezone=True),`
`15`	`16`	`nullable=False, server_default=func.now())`
`16`	`17`	`updatedAt = Column(TIMESTAMP(timezone=True),`
`17`	`18`	`default=None, onupdate=func.now())`
	`19`	`+`

Lines changed: 24 additions & 24 deletions

Comments

(0)