Fix string code generator. Fix docs

sake92 · Aug 24, 2024 · b7bd83d · b7bd83d
1 parent 7cd1bdd
commit b7bd83d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/docs/src/files/tutorials/CodeGen.scala b/docs/src/files/tutorials/CodeGen.scala
@@ -30,19 +30,27 @@ object CodeGen extends TutorialPage {
     s"""
       You can use Ammonite to test the generator:
       ```scala
-      import $$ivy.`ba.sake::squery-generator:${Consts.ArtifactVersion}`
+      import $$ivy.`ba.sake:squery-generator_2.13:${Consts.ArtifactVersion}`
+      import $$ivy.`ba.sake:squery::${Consts.ArtifactVersion}`
+      import $$ivy.`org.postgresql:postgresql:42.7.4`
+      import $$ivy.`com.zaxxer:HikariCP:5.1.0`
+      import ba.sake.squery.generator.*
 
-      val dataSource = new org.h2.jdbcx.JdbcDataSource()
-      dataSource.setURL("jdbc:postgresql://localhost:5432/mydb")
-      ds.setUser("username")
-      ds.setPassword("password")
+      val dataSource = com.zaxxer.hikari.HikariDataSource()
+      dataSource.setJdbcUrl("jdbc:postgresql://localhost:5432/mydb")
+      dataSource.setUsername("username")
+      dataSource.setPassword("password")
       
-      val generator = new SqueryGenerator(dataSource)
-      val generatedCode = generator.generateString("myschema")
+      val generator = SqueryGenerator(dataSource)
+      val generatedCode = generator.generateString(Seq("myschema"))
       repl.load(generatedCode)
 
       // now you can use the generated code
-      MyTableCrudDao.findAll()
+      val ctx = SqueryContext(dataSource)
+      ctx.run {
+        MyTableCrudDao.findAll()
+      }
+      
       """.md
   )
 

diff --git a/generator/src/ba/sake/squery/generator/SqueryGenerator.scala b/generator/src/ba/sake/squery/generator/SqueryGenerator.scala
@@ -29,9 +29,9 @@ class SqueryGenerator(ds: DataSource, config: SqueryGeneratorConfig = SqueryGene
               s"""|${Preamble}
                   |${imports}
                   |
-                  |${enumDefsScala.mkString("\n")}
+                  |${enumDefsScala.map(_.content).mkString("\n")}
                   |
-                  |${tableDefsScala.mkString("\n")}
+                  |${tableDefsScala.map(_.content).mkString("\n")}
                   |""".stripMargin
             logger.info(s"Finished generating schema '${schemaName}'")
             res