orchid-orm 1.5.14 → 1.5.16

package/src/codegen/updateTableFile/changeTable.test.ts

@@ -16,7 +16,7 @@ const baseTableName = 'BaseTable';
 const params = { baseTablePath, baseTableName, tablePath };
 const t = columnTypes;
 
-const testWritten = makeTestWritten(tablePath('table'));
+const testWritten = makeTestWritten(tablePath('some'));
 
 const tableData = newTableData();
 
@@ -30,7 +30,7 @@ const change = (
 });
 
 class Table {
-  table = 'table';
+  table = 'some';
 }
 
 describe('updateTableFile', () => {
@@ -42,8 +42,8 @@ describe('updateTableFile', () => {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({}));
 }`);
 
@@ -59,8 +59,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text(1, 10),
   }));
@@ -71,8 +71,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
   }));
@@ -90,8 +90,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     name: t.text(1, 10),
@@ -103,8 +103,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
   }));
@@ -123,8 +123,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     name: t.text(1, 10),
@@ -137,8 +137,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey()
   }));
@@ -157,8 +157,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     name: t.text(1, 10),
@@ -171,8 +171,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     name: t.text(),
@@ -192,8 +192,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     active: t.boolean(),
@@ -205,8 +205,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
     name: t.text(),
@@ -225,8 +225,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
   }));
@@ -237,8 +237,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.integer(),
   }));
@@ -263,8 +263,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text(1, 10),
   }));
@@ -275,8 +275,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     changeCollate: t.text().collate('one'),
     addCollate: t.text(),
@@ -318,8 +318,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     changeCollate: t.text().collate('two'),
     addCollate: t.text().collate('two'),
@@ -341,8 +341,8 @@ export class Table extends BaseTable {
   describe('primaryKey', () => {
     const result = `import { BaseTable } from '../baseTable';
  
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.primaryKey(['one', 'two'], { name: 'name' }),
   }));
@@ -360,8 +360,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
  
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.primaryKey(['foo', 'bar'], { name: 'baz' }),
   }));
@@ -382,8 +382,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
  
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
   }));
 }`);
@@ -405,8 +405,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().index({ order: 'one' }).index({ collate: 'en_US' })
   }));
@@ -428,8 +428,8 @@ export class Table extends BaseTable {
 
       testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().index({
       order: 'two',
@@ -444,8 +444,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text(),
   }));
@@ -467,8 +467,8 @@ export class Table extends BaseTable {
 
       testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().index({
       order: 'two',
@@ -481,8 +481,8 @@ export class Table extends BaseTable {
 
     const result = `import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.index(['6']),
     ...t.index(['7', '8']),
@@ -523,8 +523,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.index('1'),
     ...t.index(['2', '3']),
@@ -564,8 +564,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
   }));
 }`);
@@ -587,8 +587,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().foreignKey('a', 'b').foreignKey('c', 'd')
   }));
@@ -620,8 +620,8 @@ export class Table extends BaseTable {
 
       testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().foreignKey('e', 'f').foreignKey('g', 'h'),
   }));
@@ -632,8 +632,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text(),
   }));
@@ -660,8 +660,8 @@ export class Table extends BaseTable {
 
       testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     name: t.text().foreignKey('e', 'f').foreignKey('g', 'h'),
   }));
@@ -670,12 +670,12 @@ export class Table extends BaseTable {
 
     const result = `import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.foreignKey(
       ['7'],
-      'table',
+      'some',
       ['8'],
       {
         name: 'first',
@@ -700,7 +700,7 @@ export class Table extends BaseTable {
       foreignKeys: [
         {
           columns: ['7'],
-          fnOrTable: 'table',
+          fnOrTable: 'some',
           foreignColumns: ['8'],
           options: {
             name: 'first',
@@ -724,8 +724,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
     ...t.foreignKey(
       ['1'],
@@ -734,7 +734,7 @@ export class Table extends BaseTable {
     ),
     ...t.foreignKey(
       ['3', '4'],
-      'table',
+      'some',
       ['5', '6'],
       {
         name: 'foreignKeyName',
@@ -761,7 +761,7 @@ export class Table extends BaseTable {
               },
               {
                 columns: ['3', '4'],
-                fnOrTable: 'table',
+                fnOrTable: 'some',
                 foreignColumns: ['5', '6'],
                 options: {
                   name: 'foreignKeyName',
@@ -784,8 +784,8 @@ export class Table extends BaseTable {
       asMock(fs.readFile)
         .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({
   }));
 }`);

package/src/codegen/updateTableFile/changeTable.ts

@@ -41,7 +41,7 @@ export const changeTable = async ({
 
   const changes = new FileChanges(content);
   const statements = ts.getStatements(content);
-  const className = toPascalCase(ast.name);
+  const className = toPascalCase(ast.name) + 'Table';
 
   for (const { t, object } of iterateColumnsShapes(statements, className)) {
     const context = makeChangeContext(changes, ast, content, object, t);

package/src/codegen/updateTableFile/createTable.test.ts

@@ -13,7 +13,7 @@ const baseTablePath = path.resolve('baseTable.ts');
 const baseTableName = 'BaseTable';
 const params = { baseTablePath, baseTableName, tablePath };
 
-const testWritten = makeTestWritten(tablePath('table'));
+const testWritten = makeTestWritten(tablePath('some'));
 
 const template = ({
   schema,
@@ -25,8 +25,8 @@ const template = ({
   noPrimaryKey?: boolean;
 }) => `import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  ${schema ? `schema = '${schema}';\n  ` : ''}table = 'table';${
+export class SomeTable extends BaseTable {
+  ${schema ? `schema = '${schema}';\n  ` : ''}table = 'some';${
   noPrimaryKey ? '\n  noPrimaryKey = true;' : ''
 }
   columns = this.setColumns((t) => (${columns}));
@@ -48,7 +48,7 @@ describe('createTable', () => {
       },
     });
 
-    expect(asMock(fs.mkdir)).toBeCalledWith(path.dirname(tablePath('table')), {
+    expect(asMock(fs.mkdir)).toBeCalledWith(path.dirname(tablePath('some')), {
       recursive: true,
     });
 
@@ -80,7 +80,7 @@ describe('createTable', () => {
         foreignKeys: [
           {
             columns: ['one', 'two'],
-            fnOrTable: 'table',
+            fnOrTable: 'some',
             foreignColumns: ['three', 'four'],
             options: { name: 'foreignKeyName' },
           },
@@ -99,7 +99,7 @@ describe('createTable', () => {
     }),
     ...t.foreignKey(
       ['one', 'two'],
-      'table',
+      'some',
       ['three', 'four'],
       {
         name: 'foreignKeyName',
@@ -125,4 +125,15 @@ describe('createTable', () => {
       }),
     );
   });
+
+  it('should create file with wx flag', async () => {
+    asMock(fs.writeFile).mockRejectedValue(
+      Object.assign(new Error(), { code: 'EEXIST' }),
+    );
+
+    await updateTableFile({ ...params, ast: ast.addTable });
+
+    const [, , options] = asMock(fs.writeFile).mock.calls[0];
+    expect(options).toEqual({ flag: 'wx' });
+  });
 });

package/src/codegen/updateTableFile/createTable.ts

@@ -33,11 +33,19 @@ export const createTable = async ({
 
   const code: Code[] = [
     `import { ${params.baseTableName} } from '${baseTablePath}';\n`,
-    `export class ${toPascalCase(ast.name)} extends ${params.baseTableName} {`,
+    `export class ${toPascalCase(ast.name)}Table extends ${
+      params.baseTableName
+    } {`,
     props,
     '}\n',
   ];
 
   await fs.mkdir(path.dirname(tablePath), { recursive: true });
-  await fs.writeFile(tablePath, codeToString(code, '', '  '));
+  try {
+    await fs.writeFile(tablePath, codeToString(code, '', '  '), { flag: 'wx' });
+  } catch (err) {
+    if ((err as unknown as { code: string }).code !== 'EEXIST') {
+      throw err;
+    }
+  }
 };

package/src/codegen/updateTableFile/renameTable.test.ts

@@ -13,7 +13,7 @@ const baseTablePath = path.resolve('baseTable.ts');
 const baseTableName = 'BaseTable';
 const params = { baseTablePath, baseTableName, tablePath };
 
-const testWritten = makeTestWritten(tablePath('renamedTable'));
+const testWritten = makeTestWritten(tablePath('some'));
 
 describe('renameTable', () => {
   beforeEach(() => {
@@ -24,8 +24,8 @@ describe('renameTable', () => {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({}));
 }`);
 
@@ -36,8 +36,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'renamedTable';
+export class SomeTable extends BaseTable {
+  table = 'another';
   columns = this.setColumns((t) => ({}));
 }`);
   });
@@ -46,9 +46,9 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
+export class SomeTable extends BaseTable {
   schema = 'one';
-  table = 'table';
+  table = 'some';
   columns = this.setColumns((t) => ({}));
 }`);
 
@@ -63,9 +63,9 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
+export class SomeTable extends BaseTable {
   schema = 'two';
-  table = 'renamedTable';
+  table = 'another';
   columns = this.setColumns((t) => ({}));
 }`);
   });
@@ -74,9 +74,9 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
+export class SomeTable extends BaseTable {
   schema = 'one';
-  table = 'table';
+  table = 'some';
   columns = this.setColumns((t) => ({}));
 }`);
 
@@ -90,8 +90,8 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'renamedTable';
+export class SomeTable extends BaseTable {
+  table = 'another';
   columns = this.setColumns((t) => ({}));
 }`);
   });
@@ -100,8 +100,8 @@ export class Table extends BaseTable {
     asMock(fs.readFile)
       .mockResolvedValue(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
-  table = 'table';
+export class SomeTable extends BaseTable {
+  table = 'some';
   columns = this.setColumns((t) => ({}));
 }`);
 
@@ -115,9 +115,9 @@ export class Table extends BaseTable {
 
     testWritten(`import { BaseTable } from '../baseTable';
 
-export class Table extends BaseTable {
+export class SomeTable extends BaseTable {
   schema = 'schema';
-  table = 'renamedTable';
+  table = 'another';
   columns = this.setColumns((t) => ({}));
 }`);
   });

package/src/codegen/updateTableFile/renameTable.ts

@@ -17,7 +17,7 @@ export const renameTable = async ({
 
   const changes = new FileChanges(content);
   const statements = ts.getStatements(content);
-  const className = toPascalCase(ast.from);
+  const className = toPascalCase(ast.from) + 'Table';
 
   const changeSchema = ast.fromSchema !== ast.toSchema;
 
@@ -63,5 +63,5 @@ export const renameTable = async ({
     }
   }
 
-  await fs.writeFile(params.tablePath(ast.to), changes.apply());
+  await fs.writeFile(tablePath, changes.apply());
 };