Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: expose default naming strategy from Orm binding #689

Merged
merged 2 commits into from
Jun 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions adonis-typings/orm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ declare module '@ioc:Adonis/Lucid/Orm' {
DateColumnDecorator,
ModelPaginatorContract,
DateTimeColumnDecorator,
NamingStrategyContract,
} from '@ioc:Adonis/Lucid/Model'

import { SimplePaginatorMetaKeys } from '@ioc:Adonis/Lucid/Database'
Expand Down Expand Up @@ -45,6 +46,9 @@ declare module '@ioc:Adonis/Lucid/Orm' {
ModelPaginatorContract,
} from '@ioc:Adonis/Lucid/Model'

export const SnakeCaseNamingStrategy: {
new (): NamingStrategyContract
}
export const scope: ScopeFn
export const BaseModel: LucidModel

Expand Down
2 changes: 2 additions & 0 deletions providers/DatabaseProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ export default class DatabaseServiceProvider {
const decorators = require('../src/Orm/Decorators')
const { BaseModel } = require('../src/Orm/BaseModel')
const { ModelPaginator } = require('../src/Orm/Paginator')
const { SnakeCaseNamingStrategy } = require('../src/Orm/NamingStrategies/SnakeCase')

/**
* Attaching adapter to the base model. Each model is allowed to define
Expand All @@ -52,6 +53,7 @@ export default class DatabaseServiceProvider {
return {
BaseModel,
ModelPaginator,
SnakeCaseNamingStrategy,
scope,
...decorators,
}
Expand Down
2 changes: 2 additions & 0 deletions test/database-provider.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { FactoryManager } from '../src/Factory'
import { BaseModel } from '../src/Orm/BaseModel'
import { ModelPaginator } from '../src/Orm/Paginator'
import * as decorators from '../src/Orm/Decorators'
import { SnakeCaseNamingStrategy } from '../src/Orm/NamingStrategies/SnakeCase'

import { setupApplication, fs } from '../test-helpers'

Expand All @@ -39,6 +40,7 @@ test.group('Database Provider', (group) => {
assert.deepEqual(app.container.use('Adonis/Lucid/Orm'), {
BaseModel,
ModelPaginator,
SnakeCaseNamingStrategy,
scope,
...decorators,
})
Expand Down