amirho/nest
1
0
Fork 0
mirror of https://github.com/nestjs/nest.git synced 2026-02-21 23:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Kamil Myśliwiec
2023-06-12 12:24:08 +02:00
parent f925fe5b63 13819f07e7
commit 1f44c1c72a
52 changed files with 3280 additions and 4140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/typeorm/ormconfig.json
View File

@@ -1,6 +1,6 @@
{
"type": "mysql",
"host": "localhost",
"host": "127.0.0.1",
"port": 3306,
"username": "root",
"password": "root",

2
integration/typeorm/src/app.module.ts
View File

@@ -7,7 +7,7 @@ import { PhotoModule } from './photo/photo.module';
imports: [
TypeOrmModule.forRoot({
type: 'mysql',
host: 'localhost',
host: '127.0.0.1',
port: 3306,
username: 'root',
password: 'root',

2
integration/typeorm/src/async-class-options.module.ts
View File

@@ -11,7 +11,7 @@ class ConfigService implements TypeOrmOptionsFactory {
createTypeOrmOptions(): TypeOrmModuleOptions {
return {
type: 'mysql',
host: 'localhost',
host: '127.0.0.1',
port: 3306,
username: 'root',
password: 'root',

2
integration/typeorm/src/async-existing-options.module.ts
View File

@@ -11,7 +11,7 @@ class ConfigService implements TypeOrmOptionsFactory {
createTypeOrmOptions(): TypeOrmModuleOptions {
return {
type: 'mysql',
host: 'localhost',
host: '127.0.0.1',
port: 3306,
username: 'root',
password: 'root',

2
integration/typeorm/src/async-options.module.ts
View File

@@ -8,7 +8,7 @@ import { PhotoModule } from './photo/photo.module';
TypeOrmModule.forRootAsync({
useFactory: () => ({
type: 'mysql',
host: 'localhost',
host: '127.0.0.1',
port: 3306,
username: 'root',
password: 'root',

2
integration/typeorm/src/database.module.ts
View File

@@ -11,7 +11,7 @@ export class DatabaseModule {
imports: [
TypeOrmModule.forRoot({
type: 'mysql',
host: 'localhost',
host: '127.0.0.1',
port: 3306,
username: 'root',
password: 'root',