refactor: scope database class inside it's own directory

adonisjs · Jan 12, 2020 · a97a7da · a97a7da
1 parent be0a7d4
commit a97a7da
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/Connection/index.ts b/src/Connection/index.ts
@@ -17,7 +17,7 @@ import { LoggerContract } from '@poppinss/logger'
 import { patchKnex } from 'knex-dynamic-connection'
 
 import { ConnectionConfigContract, ConnectionContract } from '@ioc:Adonis/Addons/Database'
-import { QueryClient } from '../QueryClient'
+import { QueryClient } from '../Database/QueryClient'
 
 /**
  * Connection class manages a given database connection. Internally it uses

diff --git a/src/QueryBuilder/Chainable.ts → src/Database/QueryBuilder/Chainable.ts b/src/QueryBuilder/Chainable.ts → src/Database/QueryBuilder/Chainable.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { ChainableContract, QueryCallback } from '@ioc:Adonis/Addons/DatabaseQueryBuilder'

diff --git a/src/QueryBuilder/Database.ts → src/Database/QueryBuilder/Database.ts b/src/QueryBuilder/Database.ts → src/Database/QueryBuilder/Database.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { Exception } from '@poppinss/utils'
@@ -20,7 +20,7 @@ import {
  } from '@ioc:Adonis/Addons/DatabaseQueryBuilder'
 
 import { Chainable } from './Chainable'
-import { executeQuery, isInTransaction } from '../utils'
+import { executeQuery, isInTransaction } from '../../utils'
 
 /**
  * Wrapping the user function for a query callback and give them

diff --git a/src/QueryBuilder/Insert.ts → src/Database/QueryBuilder/Insert.ts b/src/QueryBuilder/Insert.ts → src/Database/QueryBuilder/Insert.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { Exception } from '@poppinss/utils'
@@ -18,7 +18,7 @@ import {
   QueryClientContract,
 } from '@ioc:Adonis/Addons/DatabaseQueryBuilder'
 
-import { executeQuery, isInTransaction } from '../utils'
+import { executeQuery, isInTransaction } from '../../utils'
 
 /**
  * Exposes the API for performing SQL inserts

diff --git a/src/QueryBuilder/Raw.ts → src/Database/QueryBuilder/Raw.ts b/src/QueryBuilder/Raw.ts → src/Database/QueryBuilder/Raw.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { Exception } from '@poppinss/utils'
@@ -17,7 +17,7 @@ import {
   TransactionClientContract,
   QueryClientContract,
 } from '@ioc:Adonis/Addons/DatabaseQueryBuilder'
-import { executeQuery } from '../utils'
+import { executeQuery } from '../../utils'
 
 /**
  * Exposes the API to execute raw queries

diff --git a/src/QueryClient/index.ts → src/Database/QueryClient/index.ts b/src/QueryClient/index.ts → src/Database/QueryClient/index.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { Exception } from '@poppinss/utils'

diff --git a/src/TransactionClient/index.ts → src/Database/TransactionClient/index.ts b/src/TransactionClient/index.ts → src/Database/TransactionClient/index.ts
@@ -7,7 +7,7 @@
  * file that was distributed with this source code.
 */
 
-/// <reference path="../../adonis-typings/database.ts" />
+/// <reference path="../../../adonis-typings/database.ts" />
 
 import * as knex from 'knex'
 import { ProfilerRowContract, ProfilerContract } from '@poppinss/profiler'

diff --git a/test-helpers/index.ts b/test-helpers/index.ts
@@ -24,9 +24,9 @@ import {
   QueryClientContract,
 } from '@ioc:Adonis/Addons/DatabaseQueryBuilder'
 
-import { RawQueryBuilder } from '../src/QueryBuilder/Raw'
-import { InsertQueryBuilder } from '../src/QueryBuilder/Insert'
-import { DatabaseQueryBuilder } from '../src/QueryBuilder/Database'
+import { RawQueryBuilder } from '../src/Database/QueryBuilder/Raw'
+import { InsertQueryBuilder } from '../src/Database/QueryBuilder/Insert'
+import { DatabaseQueryBuilder } from '../src/Database/QueryBuilder/Database'
 
 export const fs = new Filesystem(join(__dirname, 'tmp'))
 dotenv.config()

diff --git a/test/query-builder.spec.ts b/test/query-builder.spec.ts
@@ -11,7 +11,7 @@
 
 import * as test from 'japa'
 import { Connection } from '../src/Connection'
-import { DatabaseQueryBuilder } from '../src/QueryBuilder/Database'
+import { DatabaseQueryBuilder } from '../src/Database/QueryBuilder/Database'
 import {
   getConfig,
   setup,