From d2d356832358b3269de4d407da27d5fb8632616d Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 15 Sep 2009 12:33:28 +0000 Subject: [PATCH] HHH-3461 - Enhance DialectFactory to support Sybase Adaptive Server Anywhere git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@17514 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- .../java/org/hibernate/dialect/SybaseDialect.java | 13 ++++++------- .../dialect/resolver/StandardDialectResolver.java | 14 +++++++++----- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/core/src/main/java/org/hibernate/dialect/SybaseDialect.java index e99f892952..e53f0da22c 100644 --- a/core/src/main/java/org/hibernate/dialect/SybaseDialect.java +++ b/core/src/main/java/org/hibernate/dialect/SybaseDialect.java @@ -26,15 +26,14 @@ package org.hibernate.dialect; /** - * SybaseDialect is being deprecated. - * - * AbstractTransactSQLDialect should be used as a base - * class for Sybase and MS SQL Server dialects. + * This dialect is being deprecated; it had been used both as the base class + * for TransactSQL-based dialects as well as the physical dialect for handling + * Sybase. Those functions have now been split. + * {@link AbstractTransactSQLDialect} should be used as the base class for + * TransactSQL-based dialects. * * @author Gail Badner - * @deprecated SybaseASE15Dialect or SQLServerDialect should be - * used instead. + * @deprecated use {@link SybaseASE15Dialect} or {@link SQLServerDialect} instead. */ - public class SybaseDialect extends AbstractTransactSQLDialect { } diff --git a/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java b/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java index 78d131dc1e..4fa97b1ed1 100644 --- a/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java +++ b/core/src/main/java/org/hibernate/dialect/resolver/StandardDialectResolver.java @@ -1,10 +1,10 @@ /* * Hibernate, Relational Persistence for Idiomatic Java * - * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors as - * indicated by the @author tags or express copyright attribution - * statements applied by the authors. All third-party contributions are - * distributed under license by Red Hat Middleware LLC. + * Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by + * third-party contributors as indicated by either @author tags or express + * copyright attribution statements applied by the authors. All + * third-party contributions are distributed under license by Red Hat Inc. * * This copyrighted material is made available to anyone wishing to use, modify, * copy, or redistribute it subject to the terms and conditions of the GNU @@ -20,7 +20,6 @@ * Free Software Foundation, Inc. * 51 Franklin Street, Fifth Floor * Boston, MA 02110-1301 USA - * */ package org.hibernate.dialect.resolver; @@ -44,6 +43,7 @@ import org.hibernate.dialect.DB2Dialect; import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.Oracle9iDialect; import org.hibernate.dialect.Oracle8iDialect; +import org.hibernate.dialect.SybaseAnywhereDialect; /** * The standard Hibernate resolver. @@ -89,6 +89,10 @@ public class StandardDialectResolver extends AbstractDialectResolver{ return new SybaseDialect(); } + if ( databaseName.startsWith( "Adaptive Server Anywhere" ) ) { + return new SybaseAnywhereDialect(); + } + if ( "Informix Dynamic Server".equals( databaseName ) ) { return new InformixDialect(); }