orchid-orm 1.5.16 → 1.5.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchid-orm",
-  "version": "1.5.16",
+  "version": "1.5.18",
   "description": "Postgres ORM",
   "homepage": "https://orchid-orm.netlify.app/guide/orm-setup-and-overview.html",
   "repository": {
@@ -40,7 +40,7 @@
   "author": "Roman Kushyn",
   "license": "ISC",
   "dependencies": {
-    "pqb": "0.9.10",
+    "pqb": "0.9.12",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
@@ -52,10 +52,10 @@
     "@types/prompts": "^2.4.2",
     "dotenv": "^16.0.1",
     "jest": "^28.1.2",
-    "orchid-orm-schema-to-zod": "0.2.16",
+    "orchid-orm-schema-to-zod": "0.2.18",
     "pg": "^8.7.3",
     "pg-transactional-tests": "^1.0.7",
-    "rake-db": "2.3.15",
+    "rake-db": "2.3.17",
     "rimraf": "^3.0.2",
     "rollup": "^2.79.0",
     "rollup-plugin-dts": "^4.2.2",

package/src/bin/init.test.ts

@@ -441,7 +441,7 @@ export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    title: t.text(3, 100),
+    title: t.text(3, 100).unique(),
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
@@ -474,7 +474,7 @@ export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    title: t.text(3, 100),
+    title: t.text(3, 100).unique(),
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
@@ -735,7 +735,7 @@ rakeDb(config.allDatabases, {
 change(async (db) => {
   await db.createTable('post', (t) => ({
     id: t.serial().primaryKey(),
-    title: t.text(),
+    title: t.text().unique(),
     text: t.text(),
     ...t.timestamps(),
   }));

package/src/bin/init.ts

@@ -256,7 +256,7 @@ export class PostTable extends BaseTable {
   table = 'post';
   columns = this.setColumns((t) => ({
     id: t.serial().primaryKey(),
-    title: t.text(3, 100),
+    title: t.text(3, 100).unique(),
     text: t.text(20, 10000),
     ...t.timestamps(),
   }));
@@ -430,7 +430,7 @@ const createMigrations = async (config: InitConfig) => {
 change(async (db) => {
   await db.createTable('post', (t) => ({
     id: t.serial().primaryKey(),
-    title: t.text(),
+    title: t.text().unique(),
     text: t.text(),
     ...t.timestamps(),
   }));
@@ -489,7 +489,8 @@ export const seed = async () => {
 };
 
 const greet = () => {
-  console.log(`Thank you for trying Orchid ORM!
+  console.log(`
+Thank you for trying Orchid ORM!
   
 To finish setup, install dependencies:
 
@@ -502,5 +503,6 @@ then create the database:
 
 And run the migrations:
 
-> npm run db migrate`);
+> npm run db migrate
+`);
 };

package/src/codegen/updateMainFile.test.ts

@@ -109,10 +109,10 @@ export const db = orchidORM({}, {
     it('should handle object list without ending coma', async () => {
       asMock(fs.readFile).mockResolvedValue(`
 import { orchidORM } from 'orchid-orm';
-import { Some } from './tables/some';
+import { MyTable } from './tables/my.table';
 
 export const db = orchidORM({}, {
-  some: Some
+  my: MyTable,
 });
 `);
 
@@ -120,15 +120,30 @@ export const db = orchidORM({}, {
 
       testWritten(`
 import { orchidORM } from 'orchid-orm';
-import { Some } from './tables/some';
+import { MyTable } from './tables/my.table';
 import { SomeTable } from './tables/some.table';
 
 export const db = orchidORM({}, {
-  some: Some,
+  my: MyTable,
   some: SomeTable,
 });
 `);
     });
+
+    it('should not add table if it is already added', async () => {
+      asMock(fs.readFile).mockResolvedValue(`
+import { orchidORM } from 'orchid-orm';
+import { SomeTable } from './tables/some.table';
+
+export const db = orchidORM({}, {
+  some: SomeTable
+});
+`);
+
+      await updateMainFile(mainFilePath, tablePath, ast.addTable, options);
+
+      expect(fs.writeFile).not.toBeCalled();
+    });
   });
 
   describe('drop table', () => {

package/src/codegen/updateMainFile.ts

@@ -122,6 +122,12 @@ const createTable = (
   const changes = new FileChanges(content);
 
   const importPath = getImportPath(filePath, tablePath(ast.name));
+
+  const existing = Array.from(
+    ts.import.iterateWithSource(statements, importPath),
+  );
+  if (existing.length) return;
+
   const importPos = ts.import.getEndPos(statements);
   changes.add(
     importPos,