Merge pull request #123 from schemacrawler/v17.1.2-1

v17.1.3-1

Author: sualeh

Dockerfile

@@ -7,7 +7,7 @@
 # ========================================================================
 
 # Provided arguments
-ARG FROM_IMAGE=schemacrawler/schemacrawler:v17.1.1
+ARG FROM_IMAGE=schemacrawler/schemacrawler:v17.1.3
 
 # BUILDER stage - Build SchemaCrawler AI
 FROM maven:3.9-eclipse-temurin-25 AS builder

changelog.md

@@ -2,8 +2,14 @@
 
 SchemaCrawler AI release notes.
 
-<a name="v17.1.1-2"></a>
-## Release 16.28.2-2 - 2025-09-29
+<a name="v17.1.3-1"></a>
+## Release 17.1.3-1 - 2025-09-29
+
+- Build against latest SchemaCrawler version
+
+
+<a name="16.29.1-1"></a>
+## Release 16.29.1-1 - 2025-09-29
 
 - Remove "aichat" command
 

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>us.fatehi</groupId>
   <artifactId>schemacrawler-ai-aggregator</artifactId>
-  <version>17.1.1-1</version>
+  <version>17.1.3-1</version>
   <packaging>pom</packaging>
   <name>SchemaCrawler AI [Aggregator]</name>
 

schemacrawler-ai-core/pom.xml

@@ -7,7 +7,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>17.1.1-1</version>
+    <version>17.1.3-1</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
   <artifactId>schemacrawler-ai-core</artifactId>
@@ -50,14 +50,8 @@
     </dependency>
     <dependency>
       <groupId>us.fatehi</groupId>
-      <artifactId>schemacrawler-api</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>us.fatehi</groupId>
-      <artifactId>schemacrawler-tools</artifactId>
-      <type>test-jar</type>
+      <artifactId>schemacrawler-test-utility</artifactId>
+      <version>${schemacrawler.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/AbstractJsonFunctionExecutor.java

@@ -9,18 +9,22 @@
 package schemacrawler.tools.ai.functions;
 
 import schemacrawler.schemacrawler.SchemaCrawlerOptions;
-import schemacrawler.tools.ai.tools.AbstractSchemaCrawlerFunctionExecutor;
+import schemacrawler.tools.ai.tools.AbstractFunctionExecutor;
 import schemacrawler.tools.ai.tools.FunctionParameters;
+import schemacrawler.tools.ai.tools.JsonFunctionReturn;
 import schemacrawler.utility.MetaDataUtility;
 import us.fatehi.utility.property.PropertyName;
 
 public abstract class AbstractJsonFunctionExecutor<P extends FunctionParameters>
-    extends AbstractSchemaCrawlerFunctionExecutor<P> {
+    extends AbstractFunctionExecutor<P> {
 
   protected AbstractJsonFunctionExecutor(final PropertyName functionName) {
     super(functionName);
   }
 
+  @Override
+  public abstract JsonFunctionReturn call() throws Exception;
+
   protected final void refilterCatalog() {
     final SchemaCrawlerOptions options = createSchemaCrawlerOptions();
     MetaDataUtility.reduceCatalog(catalog, options);

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeRoutinesFunctionExecutor.java

@@ -23,7 +23,6 @@
 import schemacrawler.tools.ai.model.AdditionalRoutineDetails;
 import schemacrawler.tools.ai.model.CatalogDocument;
 import schemacrawler.tools.ai.model.CompactCatalogUtility;
-import schemacrawler.tools.ai.tools.FunctionReturn;
 import schemacrawler.tools.ai.tools.JsonFunctionReturn;
 import us.fatehi.utility.property.PropertyName;
 
@@ -35,7 +34,7 @@ protected DescribeRoutinesFunctionExecutor(final PropertyName functionName) {
   }
 
   @Override
-  public FunctionReturn call() throws Exception {
+  public JsonFunctionReturn call() throws Exception {
     refilterCatalog();
 
     final Collection<AdditionalRoutineDetails> routineDetails = getRoutineDetails();

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/DescribeTablesFunctionExecutor.java

@@ -22,7 +22,6 @@
 import schemacrawler.tools.ai.model.AdditionalTableDetails;
 import schemacrawler.tools.ai.model.CatalogDocument;
 import schemacrawler.tools.ai.model.CompactCatalogUtility;
-import schemacrawler.tools.ai.tools.FunctionReturn;
 import schemacrawler.tools.ai.tools.JsonFunctionReturn;
 import us.fatehi.utility.property.PropertyName;
 
@@ -34,7 +33,7 @@ protected DescribeTablesFunctionExecutor(final PropertyName functionName) {
   }
 
   @Override
-  public FunctionReturn call() throws Exception {
+  public JsonFunctionReturn call() throws Exception {
     refilterCatalog();
 
     final Collection<AdditionalTableDetails> tableDetails = getTableDetails();

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/LintFunctionExecutor.java

@@ -8,15 +8,8 @@
 
 package schemacrawler.tools.ai.functions;
 
-import schemacrawler.inclusionrule.ExcludeAll;
 import schemacrawler.inclusionrule.InclusionRule;
-import schemacrawler.schemacrawler.GrepOptionsBuilder;
-import schemacrawler.schemacrawler.LimitOptionsBuilder;
-import schemacrawler.schemacrawler.SchemaCrawlerOptions;
-import schemacrawler.schemacrawler.SchemaCrawlerOptionsBuilder;
 import schemacrawler.tools.ai.tools.AbstractExecutableFunctionExecutor;
-import schemacrawler.tools.command.text.schema.options.SchemaTextOptionsBuilder;
-import schemacrawler.tools.options.Config;
 import us.fatehi.utility.property.PropertyName;
 
 public final class LintFunctionExecutor
@@ -26,39 +19,13 @@ protected LintFunctionExecutor(final PropertyName functionName) {
     super(functionName);
   }
 
-  @Override
-  public boolean usesConnection() {
-    return true;
-  }
-
-  @Override
-  protected Config createAdditionalConfig() {
-    final SchemaTextOptionsBuilder schemaTextOptionsBuilder = SchemaTextOptionsBuilder.builder();
-    return schemaTextOptionsBuilder.noInfo().toConfig();
-  }
-
-  @Override
-  protected SchemaCrawlerOptions createSchemaCrawlerOptions() {
-    final LimitOptionsBuilder limitOptionsBuilder =
-        LimitOptionsBuilder.builder()
-            .includeSynonyms(new ExcludeAll())
-            .includeSequences(new ExcludeAll())
-            .includeRoutines(new ExcludeAll());
-    final InclusionRule grepTablesPattern = makeInclusionRule(commandOptions.tableName());
-    final GrepOptionsBuilder grepOptionsBuilder =
-        GrepOptionsBuilder.builder().includeGreppedTables(grepTablesPattern);
-    return SchemaCrawlerOptionsBuilder.newSchemaCrawlerOptions()
-        .withLimitOptions(limitOptionsBuilder.toOptions())
-        .withGrepOptions(grepOptionsBuilder.toOptions());
-  }
-
   @Override
   protected String getCommand() {
     return "lint";
   }
 
   @Override
-  protected boolean hasResults() {
-    return !catalog.getTables().isEmpty();
+  protected InclusionRule grepTablesInclusionRule() {
+    return makeInclusionRule(commandOptions.tableName());
   }
 }

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/ListAcrossTablesFunctionExecutor.java

@@ -33,7 +33,6 @@
 import schemacrawler.tools.ai.model.ForeignKeyDocument;
 import schemacrawler.tools.ai.model.IndexDocument;
 import schemacrawler.tools.ai.model.TriggerDocument;
-import schemacrawler.tools.ai.tools.FunctionReturn;
 import schemacrawler.tools.ai.tools.JsonFunctionReturn;
 import us.fatehi.utility.property.PropertyName;
 
@@ -45,7 +44,7 @@ protected ListAcrossTablesFunctionExecutor(final PropertyName functionName) {
   }
 
   @Override
-  public FunctionReturn call() throws Exception {
+  public JsonFunctionReturn call() throws Exception {
     refilterCatalog();
 
     final Collection<DependantObject<Table>> dependantObjects = new ArrayList<>();

schemacrawler-ai-core/src/main/java/schemacrawler/tools/ai/functions/ListFunctionExecutor.java

@@ -24,7 +24,6 @@
 import schemacrawler.schemacrawler.SchemaCrawlerOptionsBuilder;
 import schemacrawler.tools.ai.model.DatabaseObjectDocument;
 import schemacrawler.tools.ai.model.DatabaseObjectType;
-import schemacrawler.tools.ai.tools.FunctionReturn;
 import schemacrawler.tools.ai.tools.JsonFunctionReturn;
 import us.fatehi.utility.property.PropertyName;
 
@@ -36,7 +35,7 @@ protected ListFunctionExecutor(final PropertyName functionName) {
   }
 
   @Override
-  public FunctionReturn call() throws Exception {
+  public JsonFunctionReturn call() throws Exception {
     refilterCatalog();
 
     final Collection<DatabaseObject> databaseObjects = new ArrayList<>();